Commit 2bc314f2ce5dd1dd5614d876c1b3bb0b55b00af9
1 parent
b207ef2318
Exists in
master
smarter core-url
Showing 2 changed files with 10 additions and 1 deletions Side-by-side Diff
config-from-main.js
| ... | ... | @@ -7,13 +7,19 @@ 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 | 11 | ]; |
| 11 | 12 | |
| 12 | 13 | let config; |
| 13 | 14 | |
| 14 | 15 | for (let candindate in candindates) { |
| 15 | 16 | if (fs.existsSync(candindate)) { |
| 16 | - config = require(candindate); | |
| 17 | + try { | |
| 18 | + config = require(candindate); | |
| 19 | + config.this_config_filename = candindate; | |
| 20 | + } | |
| 21 | + catch(e) {} | |
| 22 | + | |
| 17 | 23 | break; |
| 18 | 24 | } |
| 19 | 25 | } |
core-url.js
| 1 | 1 | "use strict"; |
| 2 | 2 | |
| 3 | 3 | const config = require('./config.js'); |
| 4 | +const logger = require('../logger'); | |
| 4 | 5 | const configFromMain = require('./config-from-main'); |
| 5 | 6 | |
| 6 | 7 | let core_url; |
| 7 | 8 | |
| 8 | 9 | if (config.core_url) { |
| 10 | + logger.verbose('Using CORE url from local config.json'); | |
| 9 | 11 | core_url = config.core_url; |
| 10 | 12 | } |
| 11 | 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}); | |
| 12 | 15 | core_url = configFromMain.core.url.replace(/\/$/, '') + '/apikey/' + configFromMain.core.apikey + '/pull/task'; |
| 13 | 16 | } |
| 14 | 17 |