Compare View
Commits (3)
Changes
Showing 3 changed files Side-by-side Diff
config-from-main.js
... | ... | @@ -7,7 +7,7 @@ const candindates = [ |
7 | 7 | '/etc/komodo/config.js', |
8 | 8 | os.homedir() + '/main/config.json', |
9 | 9 | process.cwd() + '/../../main/config.json', |
10 | - os.homedir() + '/Projects/tektrans/dev/komodo/config.json' | |
10 | + os.homedir() + '/Projects/tektrans/devs/komodo/config.json' | |
11 | 11 | ]; |
12 | 12 | |
13 | 13 | let config; |
core-url.js
... | ... | @@ -7,12 +7,12 @@ const configFromMain = require('./config-from-main'); |
7 | 7 | let core_url; |
8 | 8 | |
9 | 9 | if (config.core_url) { |
10 | - logger.verbose('Using CORE url from local config.json'); | |
11 | 10 | core_url = config.core_url; |
11 | + logger.verbose('Using CORE url from local config.json', {url: core_url}); | |
12 | 12 | } |
13 | 13 | else if (configFromMain && configFromMain.core && configFromMain.core.url && configFromMain.core.apikey) { |
14 | - logger.verbose('Using CORE url from main config', {filename: configFromMain.this_config_filename}); | |
15 | 14 | core_url = configFromMain.core.url.replace(/\/$/, '') + '/apikey/' + configFromMain.core.apikey + '/pull/task'; |
15 | + logger.verbose('Using CORE url from main config', {url: core_url, filename: configFromMain.this_config_filename}); | |
16 | 16 | } |
17 | 17 | |
18 | 18 | module.exports = core_url; |