added test for SIGHUP handler

Gareth Jones · Gareth Jones · commit 281386a30c65 · 2016-11-02T08:46:34.000+11:00
diff --git a/lib/appenders/file.js b/lib/appenders/file.js
@@ -11,17 +11,19 @@ var debug = require('debug')('log4js:file')
 
 //close open files on process exit.
 process.on('exit', function() {
+  debug('Exit handler called.');
   openFiles.forEach(function (file) {
-    file.stream.end();
+    file.end();
   });
 });
 
 // On SIGHUP, close and reopen all files. This allows this appender to work with
 // logrotate. Note that if you are using logrotate, you should not set
 // `logSize`.
 process.on('SIGHUP', function() {
+  debug('SIGHUP handler called.');
   openFiles.forEach(function(writer) {
-    writer.reopen();
+    writer.closeTheStream(writer.openTheStream.bind(writer));
   });
 });
 
@@ -39,27 +41,20 @@ process.on('SIGHUP', function() {
  * @param timezoneOffset - optional timezone offset in minutes (default system local)
  */
 function fileAppender (file, layout, logSize, numBackups, options, timezoneOffset) {
-  var bytesWritten = 0;
   file = path.normalize(file);
   layout = layout || layouts.basicLayout;
   numBackups = numBackups === undefined ? 5 : numBackups;
   //there has to be at least one backup if logSize has been specified
   numBackups = numBackups === 0 ? 1 : numBackups;
 
   debug("Creating file appender (", file, ", ", logSize, ", ", numBackups, ", ", options, ")");
-  var writer = {
-    stream: openTheStream(file, logSize, numBackups, options),
-    reopen: function() {
-      this.stream.end();
-      this.stream = openTheStream(file, logSize, numBackups, options);
-    }
-  };
+  var writer = openTheStream(file, logSize, numBackups, options);
 
   // push file to the stack of open handlers
   openFiles.push(writer);
 
   return function(loggingEvent) {
-    writer.stream.write(layout(loggingEvent, timezoneOffset) + eol, "utf8");
+    writer.write(layout(loggingEvent, timezoneOffset) + eol, "utf8");
   };
 
 }
@@ -112,7 +107,7 @@ function shutdown(cb) {
     return cb();
   }
   openFiles.forEach(function(file) {
-    var stream = file.stream;
+    var stream = file;
     if (!stream.write(eol, "utf-8")) {
       stream.once('drain', function() {
         stream.end(complete);
diff --git a/test/tape/file-sighup-test.js b/test/tape/file-sighup-test.js
@@ -0,0 +1,37 @@
+"use strict";
+var test = require('tape')
+, sandbox = require('sandboxed-module');
+
+test('file appender SIGHUP', function(t) {
+  var closeCalled = 0
+  , openCalled = 0
+  , appender = sandbox.require(
+    '../../lib/appenders/file',
+    {
+      'requires': {
+        'streamroller': {
+          'RollingFileStream': function() {
+            this.openTheStream = function() {
+              openCalled++;
+            };
+
+            this.closeTheStream = function(cb) {
+              closeCalled++;
+              cb();
+            };
+
+            this.on = function() {};
+          }
+        }
+      }
+    }
+  ).appender('sighup-test-file');
+
+  process.kill(process.pid, 'SIGHUP');
+  t.plan(2);
+  setTimeout(function() {
+    t.equal(openCalled, 1, 'open should be called once');
+    t.equal(closeCalled, 1, 'close should be called once');
+    t.end();
+  }, 10);
+});
