moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix oputil hang

This commit is contained in:
Bryan Ashby 2018-06-17 15:14:31 -06:00
parent c9674e68fb
commit f3cd36ad07
3 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/config.js
View File

@ -100,7 +100,14 @@ function init(configPath, options, cb) {
};
const ConfigCache = require('./config_cache.js');
ConfigCache.getConfigWithOptions( { filePath : configPath, callback : changed }, (err, config) => {
const getConfigOptions = {
filePath : configPath,
noWatch : options.noWatch,
};
if(!options.noWatch) {
getConfigOptions.callback = changed;
}
ConfigCache.getConfigWithOptions(getConfigOptions, (err, config) => {
if(err) {
return cb(err);
}

2
core/config_cache.js
View File

@ -19,6 +19,7 @@ module.exports = new class ConfigCache
if(options.forceReCache || !cached) {
this.recacheConfigFromFile(options.filePath, (err, config) => {
if(!err && !cached) {
if(!options.noWatch) {
const watcher = sane(
paths.dirname(options.filePath),
{
@ -38,6 +39,7 @@ module.exports = new class ConfigCache
});
});
}
}
return cb(err, config, true);
});
} else {

4
core/oputil/oputil_common.js
View File

@ -2,8 +2,6 @@
/* eslint-disable no-console */
'use strict';
const resolvePath = require('../misc_util.js').resolvePath;
const config = require('../../core/config.js');
const db = require('../../core/database.js');
@ -57,7 +55,7 @@ function getConfigPath() {
function initConfig(cb) {
const configPath = getConfigPath();
config.init(configPath, { keepWsc : true }, cb);
config.init(configPath, { keepWsc : true, noWatch : true }, cb);
}
function initConfigAndDatabases(cb) {