Skip to content

GitLab

T
tangled
Commit 57f483f3 authored by Eriksson Monteiro's avatar Eriksson Monteiro
Browse files
Options

fix data load from database

parent 94f0bc74
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 12 deletions
millix_node/core/config/config-loader.js
View file @ 57f483f3
...@@ -2,6 +2,8 @@ import db from '../../database/database'; ...@@ -2,6 +2,8 @@ import db from '../../database/database';
import config from './config'; import config from './config';
import _ from 'lodash'; import _ from 'lodash';
import async from 'async'; import async from 'async';
import path from 'path';
import os from 'os';
class _ConfigLoader { class _ConfigLoader {
...@@ -151,7 +153,27 @@ class _ConfigLoader { ...@@ -151,7 +153,27 @@ class _ConfigLoader {
} }
}); });
} }
}, () => resolve(dbConfigs)); }, () => {
if (overwriteDefaultConfigsFromDatabase) {
const dataFolder = path.isAbsolute(config.STORAGE_CONNECTION.FOLDER) ? config.STORAGE_CONNECTION.FOLDER : path.join(os.homedir(), config.DATABASE_CONNECTION.FOLDER);
config.STORAGE_CONNECTION.FOLDER = path.join(dataFolder, '/storage/');
config.STORAGE_CONNECTION.PENDING_TO_SEND = path.join(dataFolder, '/storage/sending.log');
config.STORAGE_CONNECTION.PENDING_TO_RECEIVE = path.join(dataFolder, '/storage/receiving.log');
config.DATABASE_CONNECTION.FOLDER = dataFolder;
config.WALLET_KEY_PATH = path.join(dataFolder, 'millix_private_key.json');
dbConfigs.config['WALLET_KEY_PATH'] = config.WALLET_KEY_PATH;
config.NODE_KEY_PATH = path.join(dataFolder, 'node.json');
dbConfigs.config['NODE_KEY_PATH'] = config.NODE_KEY_PATH;
config.NODE_CERTIFICATE_KEY_PATH = path.join(dataFolder, 'node_certificate_key.pem');
dbConfigs.config['NODE_CERTIFICATE_KEY_PATH'] = config.NODE_CERTIFICATE_KEY_PATH;
config.NODE_CERTIFICATE_PATH = path.join(dataFolder, 'node_certificate.pem');
dbConfigs.config['NODE_CERTIFICATE_PATH'] = config.NODE_CERTIFICATE_PATH;
config.JOB_CONFIG_PATH = path.join(dataFolder, 'job.json');
dbConfigs.config['JOB_CONFIG_PATH'] = config.JOB_CONFIG_PATH;
}
resolve(dbConfigs);
});
}); });
} }
} }
......
millix_node/index.js
View file @ 57f483f3
...@@ -82,17 +82,15 @@ let pidFile = argv.pidFile; ...@@ -82,17 +82,15 @@ let pidFile = argv.pidFile;
const dataFolder = argv.dataFolder ? const dataFolder = argv.dataFolder ?
path.isAbsolute(argv.dataFolder) ? argv.dataFolder : path.join(os.homedir(), argv.dataFolder) path.isAbsolute(argv.dataFolder) ? argv.dataFolder : path.join(os.homedir(), argv.dataFolder)
: path.join(os.homedir(), config.DATABASE_CONNECTION.FOLDER); : path.join(os.homedir(), config.DATABASE_CONNECTION.FOLDER);
if (dataFolder) { config.STORAGE_CONNECTION.FOLDER = path.join(dataFolder, '/storage/');
config.STORAGE_CONNECTION.FOLDER = path.join(dataFolder, '/storage/'); config.STORAGE_CONNECTION.PENDING_TO_SEND = path.join(dataFolder, '/storage/sending.log');
config.STORAGE_CONNECTION.PENDING_TO_SEND = path.join(dataFolder, '/storage/sending.log'); config.STORAGE_CONNECTION.PENDING_TO_RECEIVE = path.join(dataFolder, '/storage/receiving.log');
config.STORAGE_CONNECTION.PENDING_TO_RECEIVE = path.join(dataFolder, '/storage/receiving.log'); config.WALLET_KEY_PATH = path.join(dataFolder, 'millix_private_key.json');
config.WALLET_KEY_PATH = path.join(dataFolder, 'millix_private_key.json'); config.NODE_KEY_PATH = path.join(dataFolder, 'node.json');
config.NODE_KEY_PATH = path.join(dataFolder, 'node.json'); config.NODE_CERTIFICATE_KEY_PATH = path.join(dataFolder, 'node_certificate_key.pem');
config.NODE_CERTIFICATE_KEY_PATH = path.join(dataFolder, 'node_certificate_key.pem'); config.NODE_CERTIFICATE_PATH = path.join(dataFolder, 'node_certificate.pem');
config.NODE_CERTIFICATE_PATH = path.join(dataFolder, 'node_certificate.pem'); config.JOB_CONFIG_PATH = path.join(dataFolder, 'job.json');
config.JOB_CONFIG_PATH = path.join(dataFolder, 'job.json'); config.DATABASE_CONNECTION.FOLDER = dataFolder;
config.DATABASE_CONNECTION.FOLDER = dataFolder;
}
if (pidFile && !path.isAbsolute(pidFile)) { if (pidFile && !path.isAbsolute(pidFile)) {
pidFile = dataFolder ? path.join(dataFolder, pidFile) : path.join(os.homedir(), pidFile); pidFile = dataFolder ? path.join(dataFolder, pidFile) : path.join(os.homedir(), pidFile);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment