Merge pull request log4js-node#661 from barwin/barwin/redis-appender-shutdown

nomiddlename · web-flow · commit 82d060247f82 · 2018-02-12T08:58:02.000+11:00
feat(redis): quit on log4js.shutdown
diff --git a/lib/appenders/redis.js b/lib/appenders/redis.js
@@ -15,14 +15,21 @@ function redisAppender(config, layout) {
     }
   });
 
-  return function (loggingEvent) {
+  const appender = function (loggingEvent) {
     const message = layout(loggingEvent);
     redisClient.publish(config.channel, message, (err) => {
       if (err) {
         console.error(`log4js.redisAppender - ${host}:${port} Error: ${util.inspect(err)}`);
       }
     });
   };
+
+  appender.shutdown = (cb) => {
+    redisClient.quit();
+    if (cb) cb();
+  };
+
+  return appender;
 }
 
 function configure(config, layouts) {
diff --git a/test/tap/redisAppender-test.js b/test/tap/redisAppender-test.js
@@ -19,7 +19,10 @@ function setupLogging(category, options) {
         publish: function (channel, message, callback) {
           fakeRedis.msgs.push({ channel: channel, message: message });
           fakeRedis.publishCb = callback;
-        }
+        },
+        quit: function () {
+          fakeRedis.quitCalled = true;
+        },
       };
     }
   };
@@ -46,6 +49,7 @@ function setupLogging(category, options) {
 
   return {
     logger: log4js.getLogger(category),
+    log4js: log4js,
     fakeRedis: fakeRedis,
     fakeConsole: fakeConsole
   };
@@ -129,5 +133,14 @@ test('log4js redisAppender', (batch) => {
     t.end();
   });
 
+  batch.test('shutdown', (t) => {
+    const setup = setupLogging('shutdown', { type: 'redis', channel: 'testing' });
+
+    setup.log4js.shutdown(() => {
+      t.ok(setup.fakeRedis.quitCalled);
+      t.end();
+    });
+  });
+
   batch.end();
 });
