Merge pull request #1937 from w3f/fix

Fix

charts/otv-backend/Chart.yaml

@@ -1,4 +1,4 @@
 description: 1K Validators Backend
 name: otv-backend
-version: v2.6.38
+version: v2.6.39
 apiVersion: v2

charts/otv-backend/values.yaml

@@ -17,7 +17,7 @@ resources:
 
 image:
   repo: web3f/otv-backend
-  tag: v2.6.38
+  tag: v2.6.39
 
 certificate:
   enabled: true

helmfile.d/10-otv-backend.yaml

@@ -11,7 +11,7 @@ releases:
     namespace: kusama
     {{ if eq .Environment.Name "production" }}
     chart: w3f/otv-backend
-    version: v2.6.38
+    version: v2.6.39
     {{ else }}
     chart: ../charts/otv-backend
     {{ end }}
@@ -27,7 +27,7 @@ releases:
     namespace: polkadot
     {{ if eq .Environment.Name "production" }}
     chart: w3f/otv-backend
-    version: v2.6.38
+    version: v2.6.39
     {{ else }}
     chart: ../charts/otv-backend
     {{ end }} 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "1k-validators-be",
-  "version": "2.6.38",
+  "version": "2.6.39",
   "description": "Services for running the Thousand Validator Program.",
   "main": "index.js",
   "scripts": {

src/index.ts

@@ -25,7 +25,7 @@ import { startClearAccumulatedOfflineTimeJob, startMonitorJob } from "./cron";
 
 const isCI = process.env.CI;
 
-const version = "v2.6.38";
+const version = "v2.6.39";
 
 const catchAndQuit = async (fn: any) => {
   try {

src/util.ts

@@ -107,19 +107,25 @@ export const fetchLocationInfo = async (addr: any, iit: any) => {
     return blank;
   }
 
-  //@ts-ignore
-  const { city, region, country, loc, org, postal, timezone } = json;
-
-  if (!org) {
-    logger.info(`no org: ${json}`);
+  try {
+    //@ts-ignore
+    const { city, region, country, loc, org, postal, timezone } = json;
+
+    if (!org) {
+      logger.info(`no org: ${json}`);
+    }
+    const asn = org.substring(0, org.indexOf(" "));
+    const provider = org.substring(org.indexOf(" ") + 1);
+    return {
+      city: city,
+      region: region,
+      country: country,
+      asn: asn,
+      provider: provider,
+    };
+  } catch (e) {
+    logger.info(`There was an error fetching location data....`);
+    logger.info(e);
+    return blank;
   }
-  const asn = org.substring(0, org.indexOf(" "));
-  const provider = org.substring(org.indexOf(" ") + 1);
-  return {
-    city: city,
-    region: region,
-    country: country,
-    asn: asn,
-    provider: provider,
-  };
 };