add options to reload function

fxding · fxding · commit 1f1442cb7cba · 2014-12-27T12:48:24.000+08:00
if `cwd` is included in option, reload will not work
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -248,12 +248,12 @@ function configureOnceOff(config, options) {`
`248`	`248`	`}`
`249`	`249`	`}`
`250`	`250`
`251`		`-function reloadConfiguration() {`
	`251`	`+function reloadConfiguration(options) {`
`252`	`252`	`var mtime = getMTime(configState.filename);`
`253`	`253`	`if (!mtime) return;`
`254`		`-`
	`254`	`+`
`255`	`255`	`if (configState.lastMTime && (mtime.getTime() > configState.lastMTime.getTime())) {`
`256`		`- configureOnceOff(loadConfigurationFile(configState.filename));`
	`256`	`+ configureOnceOff(loadConfigurationFile(configState.filename), options);`
`257`	`257`	`}`
`258`	`258`	`configState.lastMTime = mtime;`
`259`	`259`	`}`
`@@ -275,7 +275,7 @@ function initReloadConfiguration(filename, options) {`
`275`	`275`	`}`
`276`	`276`	`configState.filename = filename;`
`277`	`277`	`configState.lastMTime = getMTime(filename);`
`278`		`- configState.timerId = setInterval(reloadConfiguration, options.reloadSecs*1000);`
	`278`	`+ configState.timerId = setInterval(reloadConfiguration, options.reloadSecs*1000, options);`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`function configure(configurationFileOrObject, options) {`