Merge branch 'dev' of github.com:AliceO2Group/WebUi into feature/Jade…

…n505/OGUI-1280/logout-function
AliceO2Group · Dec 3, 2024 · d269a43 · d269a43
2 parents 6b850d5 + 205a59e
commit d269a43
Show file tree

Hide file tree

Showing 34 changed files with 2,336 additions and 917 deletions.
diff --git a/.github/workflows/control.yml b/.github/workflows/control.yml
@@ -34,7 +34,7 @@ jobs:
       - run: (cd Control; npm run coverage )
       - run: (cd Control; ./node_modules/.bin/nyc report --reporter=text-lcov > coverage.lcov)
       - name: Send codecov report for Control
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: control

diff --git a/.github/workflows/framework.yml b/.github/workflows/framework.yml
@@ -34,7 +34,7 @@ jobs:
       - run: (cd Framework; npm run coverage )
       - run: (cd Framework; ./node_modules/.bin/nyc report --reporter=text-lcov > coverage.lcov)
       - name: Send codecov report for Framework
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: framework

diff --git a/.github/workflows/infologger.yml b/.github/workflows/infologger.yml
@@ -32,7 +32,7 @@ jobs:
       - run: (cd InfoLogger; npm run coverage )
       - run: (cd InfoLogger; ./node_modules/.bin/nyc report --reporter=text-lcov > coverage.lcov)
       - name: Send codecov report for InfoLogger
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: infologger

diff --git a/.github/workflows/qc.yml b/.github/workflows/qc.yml
@@ -46,7 +46,7 @@ jobs:
       - run: (cd QualityControl; npm ci )
       - run: (cd QualityControl; npm run coverage-lcov )
       - name: Send codecov report for QualityControl
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: qualitycontrol

diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,6 @@ build
 tobject2json.node
 */.nyc*
 */test/integration/test-config*
-.vscode
+.vscode/*
+!.vscode/launch.json
 .idea
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,23 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "[ilg] run dev",
+            "request": "launch",
+            "runtimeArgs": [
+                "run-script",
+                "dev"
+            ],
+            "localRoot": "${workspaceFolder}/InfoLogger/",
+            "runtimeExecutable": "npm",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "outputCapture": "std",
+            "type": "node",
+            "windows": {
+                "localRoot": "${workspaceFolder}\\InfoLogger\\"
+            }
+        }
+    ]
+}
diff --git a/Control/lib/api.js b/Control/lib/api.js
@@ -117,15 +117,20 @@ module.exports.setup = (http, ws) => {
 
   let aliEcsSynchronizer = undefined;
   if (config.kafka && config.kafka?.enable) {
-    const kafkaClient = new Kafka({
-      clientId: 'control-gui',
-      brokers: config.kafka.brokers,
-      retry: { retries: 3 },
-      logLevel: logLevel.NOTHING,
-    });
-
-    aliEcsSynchronizer = new AliEcsSynchronizer(kafkaClient, cacheService);
-    aliEcsSynchronizer.start();
+    try {
+      const kafkaClient = new Kafka({
+        clientId: 'control-gui',
+        brokers: config.kafka.brokers,
+        retry: { retries: 3 },
+        logLevel: logLevel.NOTHING,
+      });
+      aliEcsSynchronizer = new AliEcsSynchronizer(kafkaClient, cacheService);
+      aliEcsSynchronizer.start();
+
+    } catch (error) {
+      logger.errorMessage(`Kafka initialization failed: ${error.message}`);
+    }
+
   }
 
   const statusService = new StatusService(