Merge pull request #1 from CartoDB/master

Upstream update, adds x-forwarde-for by default

lib/appenders/file.js

@@ -85,7 +85,9 @@ function configure(config, options) {
 }
 
 function shutdown(cb) {
-  async.each(openFiles, function(file, done) {
+  var filesToClose = openFiles;
+  openFiles = [];
+  async.each(filesToClose, function(file, done) {
     if (!file.write(eol, "utf-8")) {
       file.once('drain', function() {
         file.end(done);

lib/log4js.js

@@ -219,6 +219,11 @@ function clearAppenders () {
   }
 }
 
+function clearAndShutdownAppenders(cb) {
+  clearAppenders();
+  shutdownAppenders(cb);
+}
+
 function configureAppenders(appenderList, options) {
   clearAppenders();
   if (appenderList) {
@@ -428,7 +433,10 @@ function shutdown(cb) {
   // First, disable all writing to appenders. This prevents appenders from
   // not being able to be drained because of run-away log writes.
   loggerModule.disableAllLogWrites();
+  shutdownAppenders(cb);
+}
 
+function shutdownAppenders(cb) {
   // Next, get all the shutdown functions for appenders as an array.
   var shutdownFunctions = Object.keys(appenderShutdowns).reduce(
     function(accum, category) {
@@ -454,6 +462,7 @@ module.exports = {
   addAppender: addAppender,
   loadAppender: loadAppender,
   clearAppenders: clearAppenders,
+  clearAndShutdownAppenders: clearAndShutdownAppenders,
   configure: configure,
   shutdown: shutdown,