- fix resolving local config in the debug mode

Author: Valodya

bin/coderunner.json

@@ -1,26 +1,8 @@
 {
-  "managementHttpPort": null,
-  "workers": {
-    "cache": {
-      "limit": 20
-    },
-    "concurrent": 4,
-    "minIdle": 2,
-    "heartbeat": {
-      "interval": 5,
-      "timeout": 10
-    },
-    "lowPriorityThreshold": 0.8
-  },
-  "deploy": {
-    "progressInterval": 500
-  },
   "backendless": {
-    "forwardableHeaders": "",
     "msgBroker": {
       "host": "cl.backendless.com",
-      "port": 6379,
-      "max_attempts": 5
+      "port": 6379
     }
   },
   "app": {
@@ -32,13 +14,5 @@
       "node_modules/**",
       "examples/services/wsdl-proxy/**"
     ]
-  },
-  "loggers": {
-    "file": false,
-    "workers": true,
-    "managementServer": false
-  },
-  "sandbox": true,
-  "verbose": false,
-  "debug": false
+  }
 }

lib/cli/file.js renamed to lib/cli/app.js

@@ -6,7 +6,7 @@ const logger = require('../util/logger')
 
 const CONFIG_FILE = './coderunner.json'
 
-module.exports = function getOptionsFromConfigurationFile(file) {
+module.exports = function getAppOptions(file) {
   const options = readFile(file)
 
   if (typeof options.workers === 'number') {

lib/cli/defaults.json

@@ -1,5 +1,7 @@
 {
+  "managementHttpPort": null,
   "workers": {
+    "lowPriorityThreshold": 0.8,
     "cache": false,
     "concurrent": 4,
     "minIdle": 4,
@@ -36,13 +38,16 @@
   },
   "sandbox": false,
   "verbose": false,
+  "debug": false,
   "compression": {
     "debug": false,
     "prod": false,
     "cloud": false,
     "threshold": 8192
   },
   "loggers": {
+    "workers": true,
+    "managementServer": false,
     "console": true,
     "file": false,
     "backendless": true,

lib/cli/options.js

@@ -5,17 +5,14 @@
 module.exports = async function getRunOptions(appRequired, repoPathRequired) {
   const { program } = require('commander')
 
-  const getOptionsFromConfigurationFile = require('./file')
   const enrichWithENV = require('./env')
   const enrichWithProgramArguments = require('./program')
 
-  const options = await getOptionsFromConfigurationFile(program.opts().config)
-
-  const { initConfig } = require('backendless-js-services-core/lib/config')
+  const { initConfig, mergeConfigs } = require('backendless-js-services-core/lib/config')
 
   return await initConfig({
     defaults: require('./defaults.json'),
-    config  : options,
+    config  : {},
     consul  : {
       serviceKey: 'config/coderunner/js/',
       extraKeys : require('./consul.json'),
@@ -24,6 +21,14 @@ module.exports = async function getRunOptions(appRequired, repoPathRequired) {
 
     normalizeBasicConfigs(config)
 
+    if (appRequired) {
+      const getAppOptions = require('./app')
+
+      const appConfig = await getAppOptions(program.opts().config)
+
+      mergeConfigs(config, appConfig)
+    }
+
     enrichWithENV(config)
 
     await enrichWithProgramArguments(config, appRequired, repoPathRequired)

package-lock.json

@@ -36,7 +36,7 @@
   ],
   "dependencies": {
     "backendless": "^6.7.0",
-    "backendless-js-services-core": "^0.0.18",
+    "backendless-js-services-core": "^0.0.19",
     "commander": "^8.3.0",
     "glob": "^7.2.0",
     "jsdoc": "^3.6.10",