Compare View

switch
from
...
to
 
Commits (2)

Changes

Showing 3 changed files Inline Diff

1 "use strict"; 1 "use strict";
2 2
3 const config = require('./config'); 3 const config = require('./config');
4 const logger = require('./logger'); 4 const logger = require('./logger');
5 const configFiller = require('./config-filler'); 5 const configFiller = require('./config-filler');
6 6
7 function replace(new_config) { 7 function replace(new_config) {
8 for (let key in new_config) { 8 for (let key in new_config) {
9 config[key] = new_config[key]; 9 config[key] = new_config[key];
10 } 10 }
11 11
12 _removeIfNotExists(new_config); 12 _removeIfNotExists(new_config);
13 configFiller.go(); 13 configFiller.go();
14 } 14 }
15 15
16 function reload() { 16 function reload() {
17 const configFile = process.cwd() + "/config.json"; 17 const configFile = process.cwd() + "/config.json";
18 const new_config = require(configFile); 18 const new_config = require(configFile);
19 19
20 replace(new_config); 20 replace(new_config);
21 } 21 }
22 22
23 function _removeIfNotExists(new_config) { 23 function _removeIfNotExists(new_config) {
24 for (let key in config) { 24 for (let key in config) {
25 if (!new_config[key]) { 25 if (!new_config[key]) {
26 logger.verbose('Removing old config key: ' + key); 26 logger.verbose('Removing old config key: ' + key);
27 delete config[key]; 27 delete config[key];
28 } 28 }
29 } 29 }
30 } 30 }
31 31
32 exports.replace = replace; 32 exports.replace = replace;
33 exports.reload = reload; 33 exports.reload = reload;
34 34
1 "use strict"; 1 "use strict";
2 2
3 const fs = require('fs'); 3 const fs = require('fs');
4 const configFiller = require('./config-filler'); 4 const configFiller = require('./config-filler');
5 5
6 let configFile = process.cwd() + "/config.json"; 6 let configFile = process.cwd() + "/config.json";
7 7
8 if (!fs.existsSync(configFile)) { 8 if (!fs.existsSync(configFile)) {
9 console.trace('Config file not found. Terminating'); 9 console.trace('Config file not found. Terminating');
10 //setImmediate(function() { 10 //setImmediate(function() {
11 process.exit(1); 11 process.exit(1);
12 //}); 12 //});
13 } 13 }
14 14
15 const config = require(configFile); 15 const config = require(configFile);
16 configFiller.go(); 16 configFiller.go();
17 17
18 module.exports = config; 18 module.exports = config;
19 19
1 { 1 {
2 "name": "komodo-sdk", 2 "name": "komodo-sdk",
3 "version": "1.8.3", 3 "version": "1.8.4",
4 "description": "SDK for Komodo", 4 "description": "SDK for Komodo",
5 "main": "index.js", 5 "main": "index.js",
6 "scripts": { 6 "scripts": {
7 "test": "mocha", 7 "test": "mocha",
8 "postversion": "git push && git push --tags" 8 "postversion": "git push && git push --tags"
9 }, 9 },
10 "repository": { 10 "repository": {
11 "type": "git", 11 "type": "git",
12 "url": "git@gitlab.kodesumber.com:komodo/komodo-sdk.git" 12 "url": "git@gitlab.kodesumber.com:komodo/komodo-sdk.git"
13 }, 13 },
14 "keywords": [ 14 "keywords": [
15 "ppob", 15 "ppob",
16 "payment", 16 "payment",
17 "komodo" 17 "komodo"
18 ], 18 ],
19 "author": "Adhidarma Hadiwinoto <gua@adhisimon.org>", 19 "author": "Adhidarma Hadiwinoto <gua@adhisimon.org>",
20 "license": "ISC", 20 "license": "ISC",
21 "dependencies": { 21 "dependencies": {
22 "basic-auth": "^2.0.0", 22 "basic-auth": "^2.0.0",
23 "lru-cache": "^4.1.1", 23 "lru-cache": "^4.1.1",
24 "moment": "^2.19.1", 24 "moment": "^2.19.1",
25 "request": "^2.81.0", 25 "request": "^2.81.0",
26 "simple-git": "^1.80.1", 26 "simple-git": "^1.80.1",
27 "strftime": "^0.10.0", 27 "strftime": "^0.10.0",
28 "winston": "^2.3.1", 28 "winston": "^2.3.1",
29 "winston-circular-buffer": "^1.0.0", 29 "winston-circular-buffer": "^1.0.0",
30 "winston-daily-rotate-file": "^1.4.6" 30 "winston-daily-rotate-file": "^1.4.6"
31 } 31 }
32 } 32 }
33 33