Komodo / komodo-sdk

Compare View

switch
from
...
to
 
Commits (3)

Changes

Showing 4 changed files Side-by-side Diff

... ... @@ -0,0 +1,21 @@
  1 +"use strict";
  2 +
  3 +const fs = require('fs');
  4 +const os = require('os');
  5 +
  6 +const candindates = [
  7 + '/etc/komodo/config.js',
  8 + os.homedir() + '/main/config.json',
  9 + process.cwd() + '/../../main/config.json',
  10 +];
  11 +
  12 +let config;
  13 +
  14 +for (let candindate in candindates) {
  15 + if (fs.existsSync(candindate)) {
  16 + config = require(candindate);
  17 + break;
  18 + }
  19 +}
  20 +
  21 +module.exports = config;
... ... @@ -0,0 +1,15 @@
  1 +"use strict";
  2 +
  3 +const config = require('./config.js');
  4 +const configFromMain = require('./config-from-main');
  5 +
  6 +let core_url;
  7 +
  8 +if (config.core_url) {
  9 + core_url = config.core_url;
  10 +}
  11 +else if (configFromMain && configFromMain.core && configFromMain.core.url && configFromMain.core.apikey) {
  12 + core_url = configFromMain.core.url.replace(/\/$/, '') + '/apikey/' + configFromMain.core.apikey + '/pull/task';
  13 +}
  14 +
  15 +module.exports = core_url;
... ... @@ -7,6 +7,7 @@ const logger = require('../logger');
7 7 const matrix = require('../matrix');
8 8 const controlPanel = require('../control-panel');
9 9 const heartbeat = require('../heartbeat');
  10 +const core_url = require('../core-url');
10 11  
11 12 const taskArchive = require('./task-archive');
12 13  
... ... @@ -47,9 +48,10 @@ function pullTask() {
47 48  
48 49 let core_pull_task_url;
49 50  
50   - if (config.core_url) {
51   - core_pull_task_url = config.core_url + '/pull/task';
52   - } else if (config.pull_url.task) {
  51 + if (core_url) {
  52 + core_pull_task_url = core_url + '/pull/task';
  53 + }
  54 + else if (config.pull_url.task) {
53 55 core_pull_task_url = config.pull_url.task.replace('<CORE_APIKEY>', config.core_apikey);
54 56 }
55 57  
... ... @@ -184,8 +186,8 @@ function report(data) {
184 186 updateTaskOnMatrix(data.trx_id, data.rc);
185 187 }
186 188  
187   - if (config.core_url) {
188   - core_pull_report_url = config.core_url + '/pull/report';
  189 + if (core_url) {
  190 + core_pull_report_url = core_url + '/pull/report';
189 191 } else if (config.pull_url.report) {
190 192 core_pull_report_url = config.pull_url.report.replace('<CORE_APIKEY>', config.core_apikey);
191 193 }
1 1 {
2 2 "name": "komodo-sdk",
3   - "version": "1.22.7",
  3 + "version": "1.23.0",
4 4 "description": "SDK for Komodo",
5 5 "main": "index.js",
6 6 "scripts": {