Merge branch 'main' into dev

Conflicts: api/src/services/stardust/influx/influxServiceStardust.ts
iotaledger · May 8, 2024 · 444c433 · 444c433
2 parents d3b4008 + 0289727
commit 444c433
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 33 deletions.
diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -1,7 +1,7 @@
 {
     "name": "explorer-api",
     "description": "API for Tangle Explorer",
-    "version": "3.3.10-rc.1",
+    "version": "3.3.10-rc.2",
     "author": "Martyn Janes <[email protected]>",
     "repository": {
         "type": "git",

diff --git a/api/src/services/influx/influxClient.ts b/api/src/services/influx/influxClient.ts
@@ -1,4 +1,4 @@
-import { INanoDate, InfluxDB, IPingStats, IResults, toNanoDate } from "influx";
+import { INanoDate, InfluxDB, IResults, toNanoDate } from "influx";
 import moment from "moment";
 import logger from "../../logger";
 import { INetwork } from "../../models/db/INetwork";
@@ -46,7 +46,7 @@ export abstract class InfluxDbClient {
         const password = this._network.analyticsInfluxDbPassword;
 
         if (host && database && username && password) {
-            logger.verbose(`[InfluxClient Found configuration for (${network})]`);
+            logger.verbose(`[InfluxClient] Found configuration for (${network})]`);
             const token = Buffer.from(`${username}:${password}`, "utf8").toString("base64");
             const options = {
                 headers: {
@@ -56,30 +56,14 @@ export abstract class InfluxDbClient {
 
             const influxDbClient = new InfluxDB({ protocol, port, host, database, username, password, options });
 
-            return influxDbClient
-                .ping(1500)
-                .then((pingResults: IPingStats[]) => {
-                    if (pingResults.length > 0) {
-                        const anyHostIsOnline = pingResults.some((ping) => ping.online);
+            this._client = influxDbClient;
+            this.setupDataCollection();
+            logger.info(`[InfluxClient] Client started for "${network}"...`);
 
-                        if (anyHostIsOnline) {
-                            logger.info(`[InfluxClient Client started for "${network}"...`);
-                            this._client = influxDbClient;
-                            this.setupDataCollection();
-                        }
-
-                        return anyHostIsOnline;
-                    }
-
-                    return false;
-                })
-                .catch((e) => {
-                    logger.verbose(`[InfluxClient Ping failed for "${network}". ${e}`);
-                    return false;
-                });
+            return true;
         }
 
-        logger.warn(`[InfluxClient Configuration not found for "${network}".`);
+        logger.warn(`[InfluxClient] Configuration not found for "${network}".`);
         return false;
     }
 
@@ -104,7 +88,7 @@ export abstract class InfluxDbClient {
 
         if (debug) {
             logger.debug(
-                `[InfluxClient Refreshing ${description} from date
+                `[InfluxClient] Refreshing ${description} from date
                 ${fromNanoDate ? fromNanoDate.toISOString() : null} (${this._network.network})`,
             );
         }
@@ -117,7 +101,7 @@ export abstract class InfluxDbClient {
                     if (this.isAnyFieldNotNull<T>(update)) {
                         if (debug) {
                             logger.debug(
-                                `[InfluxClient Setting ${description} cache entry (${network}): ${moment(update.time).format(
+                                `[InfluxClient] Setting ${description} cache entry (${network}): ${moment(update.time).format(
                                     DAY_KEY_FORMAT,
                                 )}`,
                             );
@@ -126,7 +110,7 @@ export abstract class InfluxDbClient {
                         cacheEntryToFetch.set(moment(update.time).format(DAY_KEY_FORMAT), update);
                     } else if (debug) {
                         logger.warn(
-                            `[InfluxClient Found empty result entry while populating cache (${network}).
+                            `[InfluxClient] Found empty result entry while populating cache (${network}).
                             ${JSON.stringify(update)}`,
                         );
                     }

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,7 +1,7 @@
 {
     "name": "explorer-client",
     "description": "Tangle Explorer UI",
-    "version": "3.3.10-rc.1",
+    "version": "3.3.10-rc.2",
     "author": "Martyn Janes <[email protected]>",
     "type": "module",
     "repository": {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "explorer",
     "description": "Tangle Explorer",
-    "version": "3.3.10-rc.1",
+    "version": "3.3.10-rc.2",
     "scripts": {
         "setup:client": "cd client && npm install && npm run postinstall",
         "setup:api": "cd api && npm install && npm run build-compile && npm run build-config",