Komodo / komodo-sdk

Compare View

switch
from
...
to
 
Commits (3)

Changes

Showing 4 changed files Side-by-side Diff

... ... @@ -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 }
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  
... ... @@ -51,7 +51,7 @@ function pullTask() {
51 51 if (core_url) {
52 52 core_pull_task_url = core_url + '/pull/task';
53 53 }
54   - else if (config.pull_url.task) {
  54 + else if (config && config.pull_url && config.pull_url.task) {
55 55 core_pull_task_url = config.pull_url.task.replace('<CORE_APIKEY>', config.core_apikey);
56 56 }
57 57  
... ... @@ -188,7 +188,7 @@ function report(data) {
188 188  
189 189 if (core_url) {
190 190 core_pull_report_url = core_url + '/pull/report';
191   - } else if (config.pull_url.report) {
  191 + } else if (config && config.pull_url && config.pull_url.report) {
192 192 core_pull_report_url = config.pull_url.report.replace('<CORE_APIKEY>', config.core_apikey);
193 193 }
194 194  
1 1 {
2 2 "name": "komodo-sdk",
3   - "version": "1.23.0",
  3 + "version": "1.23.1",
4 4 "description": "SDK for Komodo",
5 5 "main": "index.js",
6 6 "scripts": {