From 1f1442cb7cbae0583e3740317f17724e0bb806ca Mon Sep 17 00:00:00 2001 From: Fuxian Ding Date: Sat, 27 Dec 2014 12:48:24 +0800 Subject: [PATCH] add options to reload function if `cwd` is included in option, reload will not work --- lib/log4js.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/log4js.js b/lib/log4js.js index 2e1f25c..59c9ead 100644 --- a/lib/log4js.js +++ b/lib/log4js.js @@ -248,12 +248,12 @@ function configureOnceOff(config, options) { } } -function reloadConfiguration() { +function reloadConfiguration(options) { var mtime = getMTime(configState.filename); if (!mtime) return; - + if (configState.lastMTime && (mtime.getTime() > configState.lastMTime.getTime())) { - configureOnceOff(loadConfigurationFile(configState.filename)); + configureOnceOff(loadConfigurationFile(configState.filename), options); } configState.lastMTime = mtime; } @@ -275,7 +275,7 @@ function initReloadConfiguration(filename, options) { } configState.filename = filename; configState.lastMTime = getMTime(filename); - configState.timerId = setInterval(reloadConfiguration, options.reloadSecs*1000); + configState.timerId = setInterval(reloadConfiguration, options.reloadSecs*1000, options); } function configure(configurationFileOrObject, options) {