[OGUI-484] Add checks for errors in mysql sources (#448)

* [OGUI-484] Add checks for errors in mysql sources * [OGUI-484] Use latest version of web-ui * [OGUI-484] Increase timeout * [OGUI-484] Use new web-ui
AliceO2Group · Feb 18, 2020 · 4526b15 · 4526b15
1 parent f6626b6
commit 4526b15
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 53 deletions.
diff --git a/InfoLogger/config-default.js b/InfoLogger/config-default.js
@@ -16,7 +16,8 @@ module.exports = {
     user: 'root',
     password: 'root',
     database: 'INFOLOGGER',
-    port: 3306
+    port: 3306,
+    timeout: 60000
   },
 
   // optional data source, comment object if not used

diff --git a/InfoLogger/lib/api.js b/InfoLogger/lib/api.js
@@ -13,11 +13,19 @@ const jsonDb = new JsonFileConnector(config.dbFile || __dirname + '/../db.json')
 
 if (config.mysql) {
   log.info(`Detected InfoLogger database configration`);
-  const connection = new MySQL(config.mysql);
-  querySource = new SQLDataSource(connection, config.mysql);
-  querySource.isConnectionUpAndRunning();
+  const connector = new MySQL(config.mysql);
+  connector.testConnection().then(() => {
+    querySource = new SQLDataSource(connector, config.mysql);
+    querySource.isConnectionUpAndRunning().catch((error) => {
+      log.error(`Unable to instantiate data source due to ${error}`);
+      querySource = null;
+    });
+  }).catch((error) => {
+    log.error(`Unable to connect to mysql due to ${error}`);
+    querySource = null;
+  });
 } else {
-  log.warn(`InfoLogger databse config not found, Query mode not available`);
+  log.warn(`InfoLogger database config not found, Query mode not available`);
 }
 
 if (config.infoLoggerServer) {
@@ -54,9 +62,13 @@ module.exports.attachTo = (http, ws) => {
    * @param {Response} res
    */
   function query(req, res) {
-    querySource.queryFromFilters(req.body.criterias, req.body.options)
-      .then((result) => res.json(result))
-      .catch((error) => handleError(res, error));
+    if (querySource) {
+      querySource.queryFromFilters(req.body.criterias, req.body.options)
+        .then((result) => res.json(result))
+        .catch((error) => handleError(res, error));
+    } else {
+      handleError(res, 'MySQL Data Source is not available');
+    }
   }
 
   /**

diff --git a/InfoLogger/package-lock.json b/InfoLogger/package-lock.json
diff --git a/InfoLogger/package.json b/InfoLogger/package.json
@@ -2,7 +2,7 @@
   "name": "@aliceo2/infologger",
   "version": "1.2.2",
   "description": "Infologger GUI to query and stream log events",
-  "author":  "Vladimir Kosmala",
+  "author": "Vladimir Kosmala",
   "contributors": [
     "George Raduta",
     "Adam Wegrzynek"
@@ -27,7 +27,7 @@
     "coverage-local": "nyc --reporter=lcov npm run mocha"
   },
   "dependencies": {
-    "@aliceo2/web-ui": "1.9.1"
+    "@aliceo2/web-ui": "1.9.4"
   },
   "devDependencies": {
     "eslint": "^5.15.0",
@@ -38,4 +38,4 @@
     "sinon": "^7.3.2"
   },
   "main": "index.js"
-}
+}
diff --git a/InfoLogger/public/Model.js b/InfoLogger/public/Model.js
@@ -100,7 +100,11 @@ export default class Model extends Observable {
     }
 
     if (!result.query && !result.live) {
-      this.notification.show(`No service configured`, 'danger', Infinity);
+      this.notification.show(`No QUERY / LIVE services configured`, 'danger', Infinity);
+    } else if (!result.query) {
+      this.notification.show(`No QUERY service configured`, 'danger', Infinity);
+    } else if (!result.live) {
+      this.notification.show(`No LIVE service configured`, 'danger', Infinity);
     }
 
     this.servicesResult = RemoteData.success(result);

diff --git a/InfoLogger/test/mocha-index.js b/InfoLogger/test/mocha-index.js
@@ -281,7 +281,7 @@ describe('InfoLogger', function() {
         window.model.log.filter.setCriteria('hostname', 'match', 'aldaqecs01-v1');
       });
       await page.evaluate(() => window.model.log.liveStart());
-      await page.waitFor(5000);
+      await page.waitFor(7000);
       const list = await page.evaluate(() => window.model.log.list);
       await page.waitFor(1000);
       const isHostNameMatching = list.map((element) => element.hostname).every((hostname) => hostname === 'aldaqecs01-v1');