Skip to content

Commit

Permalink
Merge pull request #269 from Nekle/master
Browse files Browse the repository at this point in the history
add options to reload function
  • Loading branch information
nomiddlename committed Jan 10, 2015
2 parents ec5f448 + 1f1442c commit 51ab296
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/log4js.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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) {
Expand Down

0 comments on commit 51ab296

Please sign in to comment.