From cb12a1e9d4d9d1bf65a7fc5d9427ee37e95d3084 Mon Sep 17 00:00:00 2001 From: Shusetsu Toda Date: Tue, 10 Jul 2018 17:31:50 +0200 Subject: [PATCH 1/2] :bug: Fix config usage in worker_controller --- workers_controller.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/workers_controller.js b/workers_controller.js index abf5978a680..7f3b6e1df08 100644 --- a/workers_controller.js +++ b/workers_controller.js @@ -14,8 +14,6 @@ 'use strict'; -var path = require('path'); -var fs = require('fs'); var async = require('async'); var SCWorker = require('socketcluster/scworker'); var SlaveWAMPServer = require('wamp-socket-cluster/SlaveWAMPServer'); @@ -30,14 +28,8 @@ var PeersUpdateRules = require('./api/ws/workers/peers_update_rules'); var Rules = require('./api/ws/workers/rules'); var failureCodes = require('./api/ws/rpc/failure_codes'); var Logger = require('./logger'); - -var config = fs.readFileSync( - path.resolve( - process.cwd(), - `./config/${process.env.LISK_NETWORK}/config.json` - ), - 'utf8' -); +var AppConfig = require('./helpers/config.js'); +var config = AppConfig(require('./package.json')); /** * Instantiate the SocketCluster SCWorker instance with custom logic From f1fbed88be4a9690a8c198587cdf5317854d8093 Mon Sep 17 00:00:00 2001 From: Shusetsu Toda Date: Wed, 11 Jul 2018 16:40:46 +0200 Subject: [PATCH 2/2] :recycle: Change not to read config from cli --- workers_controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workers_controller.js b/workers_controller.js index 7f3b6e1df08..675cbe8e99f 100644 --- a/workers_controller.js +++ b/workers_controller.js @@ -29,7 +29,7 @@ var Rules = require('./api/ws/workers/rules'); var failureCodes = require('./api/ws/rpc/failure_codes'); var Logger = require('./logger'); var AppConfig = require('./helpers/config.js'); -var config = AppConfig(require('./package.json')); +var config = AppConfig(require('./package.json'), false); /** * Instantiate the SocketCluster SCWorker instance with custom logic