fix: #1977 timeout enumeration for cron job fixed (#824)

* fixed enum value * fixed dependencies * fix: removed unused config * fix: vulnerability check ignored urijs dependency for a month * removed unused config from docker configs
mojaloop · Mar 5, 2021 · 2bb426d · 2bb426d
1 parent eda654b
commit 2bb426d
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 49 deletions.
diff --git a/audit-resolve.json b/audit-resolve.json
@@ -114,8 +114,18 @@
       "decision": "ignore",
       "madeAt": 1613868373740,
       "expiresAt": 1616460368344
+    },
+    "1640|@mojaloop/central-services-health>@mojaloop/central-services-shared>widdershins>urijs": {
+      "decision": "ignore",
+      "madeAt": 1614766410157,
+      "expiresAt": 1617358384743
+    },
+    "1640|@mojaloop/central-services-shared>widdershins>urijs": {
+      "decision": "ignore",
+      "madeAt": 1614766410157,
+      "expiresAt": 1617358384743
     }
   },
   "rules": {},
   "version": 1
-}
+}
diff --git a/config/default.json b/config/default.json
@@ -46,11 +46,6 @@
     "API": {
       "DISABLED": false
     },
-    "CRON": {
-      "DISABLED": false,
-      "TIMEXP": "*/10 * * * * *",
-      "TIMEZONE": "UTC"
-    },
     "TIMEOUT": {
       "DISABLED": false,
       "TIMEXP": "*/15 * * * * *",

diff --git a/docker/central-ledger/default.json b/docker/central-ledger/default.json
@@ -46,11 +46,6 @@
     "API": {
       "DISABLED": false
     },
-    "CRON": {
-      "DISABLED": false,
-      "TIMEXP": "*/10 * * * * *",
-      "TIMEZONE": "UTC"
-    },
     "TIMEOUT": {
       "DISABLED": false,
       "TIMEXP": "*/15 * * * * *",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -91,7 +91,7 @@
     "@mojaloop/central-services-health": "11.0.0",
     "@mojaloop/central-services-logger": "10.6.0",
     "@mojaloop/central-services-metrics": "9.5.0",
-    "@mojaloop/central-services-shared": "11.5.5",
+    "@mojaloop/central-services-shared": "11.5.6",
     "@mojaloop/central-services-stream": "10.6.0",
     "@mojaloop/event-sdk": "10.6.0",
     "@mojaloop/forensic-logging-client": "8.3.0",
@@ -112,7 +112,7 @@
     "hapi-auth-bearer-token": "8.0.0",
     "hapi-swagger": "14.1.0",
     "ilp-packet": "2.2.0",
-    "knex": "0.21.18",
+    "knex": "0.95.1",
     "lodash": "4.17.21",
     "moment": "2.29.1",
     "mongoose": "5.11.18",
@@ -132,7 +132,7 @@
     "jsonpath": "1.1.0",
     "nodemon": "2.0.7",
     "npm-audit-resolver": "2.2.1",
-    "npm-check-updates": "11.1.9",
+    "npm-check-updates": "11.1.10",
     "nyc": "15.1.0",
     "pre-commit": "1.2.2",
     "proxyquire": "2.1.3",

diff --git a/src/handlers/timeouts/handler.js b/src/handlers/timeouts/handler.js
@@ -175,7 +175,7 @@ const registerTimeoutHandler = async () => {
       cronTime: Config.HANDLERS_TIMEOUT_TIMEXP,
       onTick: timeout,
       start: false,
-      timeZone: Config.HANDLERS_CRON_TIMEZONE
+      timeZone: Config.HANDLERS_TIMEOUT_TIMEZONE
     })
     isRegistered = true
 

diff --git a/src/lib/config.js b/src/lib/config.js
@@ -14,10 +14,6 @@ module.exports = {
   HANDLERS_DISABLED: RC.HANDLERS.DISABLED,
   HANDLERS_API: RC.HANDLERS.API,
   HANDLERS_API_DISABLED: RC.HANDLERS.API.DISABLED,
-  HANDLERS_CRON: RC.HANDLERS.CRON,
-  HANDLERS_CRON_DISABLED: RC.HANDLERS.CRON.DISABLED,
-  HANDLERS_CRON_TIMEXP: RC.HANDLERS.CRON.TIMEXP,
-  HANDLERS_CRON_TIMEZONE: RC.HANDLERS.CRON.TIMEZONE,
   HANDLERS_TIMEOUT: RC.HANDLERS.TIMEOUT,
   HANDLERS_TIMEOUT_DISABLED: RC.HANDLERS.TIMEOUT.DISABLED,
   HANDLERS_TIMEOUT_TIMEXP: RC.HANDLERS.TIMEOUT.TIMEXP,

diff --git a/test/integration-config.json b/test/integration-config.json
@@ -50,11 +50,6 @@
     "API": {
       "DISABLED": false
     },
-    "CRON": {
-      "DISABLED": false,
-      "TIMEXP": "*/10 * * * * *",
-      "TIMEZONE": "UTC"
-    },
     "TIMEOUT": {
       "DISABLED": false,
       "TIMEXP": "*/15 * * * * *",