diff --git a/core/archive_util.js b/core/archive_util.js index 47291860..86bb7ce7 100644 --- a/core/archive_util.js +++ b/core/archive_util.js @@ -50,17 +50,17 @@ module.exports = class ArchiveUtil { } // singleton access - static getInstance(noWatch = false) { + static getInstance(hotReload = true) { if(!archiveUtil) { archiveUtil = new ArchiveUtil(); - archiveUtil.init(noWatch); + archiveUtil.init(hotReload); } return archiveUtil; } - init(noWatch = false) { + init(hotReload = true) { this.reloadConfig(); - if(!noWatch) { + if(hotReload) { Events.on(Events.getSystemEvents().ConfigChanged, () => { this.reloadConfig(); }); diff --git a/core/config_cache.js b/core/config_cache.js index 62c6bb55..631fb5f1 100644 --- a/core/config_cache.js +++ b/core/config_cache.js @@ -2,10 +2,11 @@ 'use strict'; // deps -const paths = require('path'); -const fs = require('graceful-fs'); -const hjson = require('hjson'); -const sane = require('sane'); +const paths = require('path'); +const fs = require('graceful-fs'); +const hjson = require('hjson'); +const sane = require('sane'); +const _ = require('lodash'); module.exports = new class ConfigCache { @@ -14,12 +15,13 @@ module.exports = new class ConfigCache } getConfigWithOptions(options, cb) { + options.hotReload = _.get(options, 'hotReload', true); const cached = this.cache.has(options.filePath); if(options.forceReCache || !cached) { this.recacheConfigFromFile(options.filePath, (err, config) => { if(!err && !cached) { - if(!options.noWatch) { + if(options.hotReload) { const watcher = sane( paths.dirname(options.filePath), { diff --git a/core/oputil/oputil_common.js b/core/oputil/oputil_common.js index e1d6c962..ae63fa2a 100644 --- a/core/oputil/oputil_common.js +++ b/core/oputil/oputil_common.js @@ -71,7 +71,7 @@ function getConfigPath() { function initConfig(cb) { const configPath = getConfigPath(); - config.init(configPath, { keepWsc : true, noWatch : true }, cb); + config.init(configPath, { keepWsc : true, hotReload : false }, cb); } function initConfigAndDatabases(cb) { @@ -85,7 +85,7 @@ function initConfigAndDatabases(cb) { }, function initArchiveUtil(callback) { // ensure we init ArchiveUtil without events - require('../../core/archive_util').getInstance(true); // true=noWatch + require('../../core/archive_util').getInstance(false); // false=hotReload return callback(null); } ],