From 18310268a5991fe69f8ab70f520c5c8e853a5997 Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Thu, 7 Apr 2016 10:14:34 -0400 Subject: [PATCH] node: log intro with config path --- lib/node.js | 9 +++++++++ lib/scaffold/default-base-config.js | 2 +- lib/scaffold/default-config.js | 2 +- lib/scaffold/start.js | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/node.js b/lib/node.js index be4ec189..893dba1c 100644 --- a/lib/node.js +++ b/lib/node.js @@ -40,6 +40,7 @@ function Node(config) { if(!(this instanceof Node)) { return new Node(config); } + this.configPath = config.path; this.errors = errors; this.log = log; this.network = null; @@ -215,6 +216,12 @@ Node.prototype._startService = function(serviceInfo, callback) { }; +Node.prototype._logTitle = function() { + console.log('\n\n\n\n\n\n\n\n\n\n\n\n'); + log.info('Using config:', this.configPath); +}; + + /** * Will start all running services in the order based on the dependency chain. * @param {Function} callback - Called when all services are started @@ -223,6 +230,8 @@ Node.prototype.start = function(callback) { var self = this; var servicesOrder = this.getServiceOrder(); + self._logTitle(); + async.eachSeries( servicesOrder, function(service, next) { diff --git a/lib/scaffold/default-base-config.js b/lib/scaffold/default-base-config.js index 6cc5b316..eae48369 100644 --- a/lib/scaffold/default-base-config.js +++ b/lib/scaffold/default-base-config.js @@ -21,7 +21,7 @@ function getDefaultBaseConfig(options) { servicesConfig: { bitcoind: { datadir: options.datadir || path.resolve(process.env.HOME, '.bitcoin'), - exec: path.resolve(__dirname, '../../dist/bitcoind') + exec: path.resolve(__dirname, '../../bin/bitcoind') } } } diff --git a/lib/scaffold/default-config.js b/lib/scaffold/default-config.js index 145b6a5c..8a477300 100644 --- a/lib/scaffold/default-config.js +++ b/lib/scaffold/default-config.js @@ -37,7 +37,7 @@ function getDefaultConfig(options) { servicesConfig: { bitcoind: { datadir: path.resolve(defaultPath, './data'), - exec: path.resolve(__dirname, '../../dist/bitcoind') + exec: path.resolve(__dirname, '../../bin/bitcoind') } } }; diff --git a/lib/scaffold/start.js b/lib/scaffold/start.js index 2f2bcfad..47c61307 100644 --- a/lib/scaffold/start.js +++ b/lib/scaffold/start.js @@ -200,6 +200,7 @@ function start(options) { servicesPath = options.path; // defaults to the same directory } + fullConfig.path = path.resolve(options.path, './bitcore-node.json'); fullConfig.services = start.setupServices(require, servicesPath, options.config); var node = new BitcoreNode(fullConfig);