passenger 6.0.10 → 6.0.13

data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c

@@ -709,6 +709,18 @@ passenger_conf_set_load_shell_envvars(ngx_conf_t *cf, ngx_command_t *cmd, void *
     return ngx_conf_set_flag_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_preload_bundler(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.preload_bundler_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.preload_bundler_source_file,
+        &passenger_conf->autogenerated.preload_bundler_source_line);
+
+    return ngx_conf_set_flag_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_max_request_queue_size(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
@@ -937,6 +949,18 @@ passenger_conf_set_request_queue_overflow_status_code(ngx_conf_t *cf, ngx_comman
     return ngx_conf_set_num_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_spawn_exception_status_code(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.spawn_exception_status_code_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.spawn_exception_status_code_source_file,
+        &passenger_conf->autogenerated.spawn_exception_status_code_source_line);
+
+    return ngx_conf_set_num_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_buffer_upload(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;

data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c

@@ -72,6 +72,7 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->direct_instance_request_address.data = NULL;
     conf->direct_instance_request_address.len  = 0;
     conf->load_shell_envvars = NGX_CONF_UNSET;
+    conf->preload_bundler = NGX_CONF_UNSET;
     conf->max_request_queue_size = NGX_CONF_UNSET_UINT;
     conf->app_type.data = NULL;
     conf->app_type.len  = 0;
@@ -91,6 +92,7 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->headers_hash_max_size = NGX_CONF_UNSET_UINT;
     conf->headers_hash_bucket_size = NGX_CONF_UNSET_UINT;
     conf->request_queue_overflow_status_code = NGX_CONF_UNSET;
+    conf->spawn_exception_status_code = NGX_CONF_UNSET;
     conf->buffer_upload = NGX_CONF_UNSET;
     conf->sticky_sessions = NGX_CONF_UNSET;
     conf->sticky_sessions_cookie_name.data = NULL;
@@ -182,6 +184,10 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->load_shell_envvars_source_file.len = 0;
     conf->load_shell_envvars_source_line = 0;
     conf->load_shell_envvars_explicitly_set = 0;
+    conf->preload_bundler_source_file.data = NULL;
+    conf->preload_bundler_source_file.len = 0;
+    conf->preload_bundler_source_line = 0;
+    conf->preload_bundler_explicitly_set = 0;
     conf->max_request_queue_size_source_file.data = NULL;
     conf->max_request_queue_size_source_file.len = 0;
     conf->max_request_queue_size_source_line = 0;
@@ -286,6 +292,10 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->request_queue_overflow_status_code_source_file.len = 0;
     conf->request_queue_overflow_status_code_source_line = 0;
     conf->request_queue_overflow_status_code_explicitly_set = 0;
+    conf->spawn_exception_status_code_source_file.data = NULL;
+    conf->spawn_exception_status_code_source_file.len = 0;
+    conf->spawn_exception_status_code_source_line = 0;
+    conf->spawn_exception_status_code_explicitly_set = 0;
     conf->buffer_upload_source_file.data = NULL;
     conf->buffer_upload_source_file.len = 0;
     conf->buffer_upload_source_line = 0;

data/src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c

@@ -172,6 +172,13 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
             : sizeof("f\r\n") - 1;
     }
 
+    if (conf->autogenerated.preload_bundler != NGX_CONF_UNSET) {
+        len += sizeof("!~PASSENGER_PRELOAD_BUNDLER: ") - 1;
+        len += conf->autogenerated.preload_bundler
+            ? sizeof("t\r\n") - 1
+            : sizeof("f\r\n") - 1;
+    }
+
     if (conf->autogenerated.max_request_queue_size != NGX_CONF_UNSET_UINT) {
         end = ngx_snprintf(int_buf,
             sizeof(int_buf) - 1,
@@ -231,6 +238,16 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         len += sizeof("\r\n") - 1;
     }
 
+    if (conf->autogenerated.spawn_exception_status_code != NGX_CONF_UNSET) {
+        end = ngx_snprintf(int_buf,
+            sizeof(int_buf) - 1,
+            "%d",
+            conf->autogenerated.spawn_exception_status_code);
+        len += sizeof("!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE: ") - 1;
+        len += end - int_buf;
+        len += sizeof("\r\n") - 1;
+    }
+
     if (conf->autogenerated.sticky_sessions != NGX_CONF_UNSET) {
         len += sizeof("!~PASSENGER_STICKY_SESSIONS: ") - 1;
         len += conf->autogenerated.sticky_sessions
@@ -443,6 +460,17 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         }
     }
 
+    if (conf->autogenerated.preload_bundler != NGX_CONF_UNSET) {
+        pos = ngx_copy(pos,
+            "!~PASSENGER_PRELOAD_BUNDLER: ",
+            sizeof("!~PASSENGER_PRELOAD_BUNDLER: ") - 1);
+        if (conf->autogenerated.preload_bundler) {
+            pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
+        } else {
+            pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
+        }
+    }
+
     if (conf->autogenerated.max_request_queue_size != NGX_CONF_UNSET_UINT) {
         pos = ngx_copy(pos,
             "!~PASSENGER_MAX_REQUEST_QUEUE_SIZE: ",
@@ -516,6 +544,17 @@ passenger_serialize_autogenerated_loc_conf_to_headers(ngx_conf_t *cf, passenger_
         pos = ngx_copy(pos, int_buf, end - int_buf);
         pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
     }
+    if (conf->autogenerated.spawn_exception_status_code != NGX_CONF_UNSET) {
+        pos = ngx_copy(pos,
+            "!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE: ",
+            sizeof("!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE: ") - 1);
+        end = ngx_snprintf(int_buf,
+            sizeof(int_buf) - 1,
+            "%d",
+            conf->autogenerated.spawn_exception_status_code);
+        pos = ngx_copy(pos, int_buf, end - int_buf);
+        pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
+    }
     if (conf->autogenerated.sticky_sessions != NGX_CONF_UNSET) {
         pos = ngx_copy(pos,
             "!~PASSENGER_STICKY_SESSIONS: ",

data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c

@@ -318,6 +318,19 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
         psg_json_value_set_bool(hierarchy_member, "value",
             plcf->autogenerated.load_shell_envvars);
     }
+    if (plcf->autogenerated.preload_bundler_explicitly_set) {
+        find_or_create_manifest_app_and_loc_options_containers(ctx,
+            plcf, cscf, clcf, &app_options_container, &loc_options_container);
+        option_container = find_or_create_manifest_option_container(ctx,
+            app_options_container,
+            "passenger_preload_bundler",
+            sizeof("passenger_preload_bundler") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.preload_bundler_source_file,
+            plcf->autogenerated.preload_bundler_source_line);
+        psg_json_value_set_bool(hierarchy_member, "value",
+            plcf->autogenerated.preload_bundler);
+    }
     if (plcf->autogenerated.max_request_queue_size_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);
@@ -596,6 +609,19 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
         psg_json_value_set_int(hierarchy_member, "value",
             plcf->autogenerated.request_queue_overflow_status_code);
     }
+    if (plcf->autogenerated.spawn_exception_status_code_explicitly_set) {
+        find_or_create_manifest_app_and_loc_options_containers(ctx,
+            plcf, cscf, clcf, &app_options_container, &loc_options_container);
+        option_container = find_or_create_manifest_option_container(ctx,
+            loc_options_container,
+            "passenger_spawn_exception_status_code",
+            sizeof("passenger_spawn_exception_status_code") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.spawn_exception_status_code_source_file,
+            plcf->autogenerated.spawn_exception_status_code_source_line);
+        psg_json_value_set_int(hierarchy_member, "value",
+            plcf->autogenerated.spawn_exception_status_code);
+    }
     if (plcf->autogenerated.buffer_upload_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);

data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c

@@ -107,6 +107,9 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
     ngx_conf_merge_value(conf->load_shell_envvars,
         prev->load_shell_envvars,
         1);
+    ngx_conf_merge_value(conf->preload_bundler,
+        prev->preload_bundler,
+        0);
     ngx_conf_merge_uint_value(conf->max_request_queue_size,
         prev->max_request_queue_size,
         100);
@@ -151,6 +154,9 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
     ngx_conf_merge_value(conf->request_queue_overflow_status_code,
         prev->request_queue_overflow_status_code,
         503);
+    ngx_conf_merge_value(conf->spawn_exception_status_code,
+        prev->spawn_exception_status_code,
+        500);
     ngx_conf_merge_value(conf->buffer_upload,
         prev->buffer_upload,
         0);

data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h

@@ -56,7 +56,9 @@ typedef struct {
     ngx_uint_t max_requests;
     ngx_uint_t min_instances;
     ngx_array_t *monitor_log_file;
+    ngx_flag_t preload_bundler;
     ngx_int_t request_queue_overflow_status_code;
+    ngx_int_t spawn_exception_status_code;
     ngx_uint_t start_timeout;
     ngx_flag_t sticky_sessions;
     ngx_str_t app_group_name;
@@ -110,10 +112,12 @@ typedef struct {
     ngx_str_t min_instances_source_file;
     ngx_str_t monitor_log_file_source_file;
     ngx_str_t nodejs_source_file;
+    ngx_str_t preload_bundler_source_file;
     ngx_str_t python_source_file;
     ngx_str_t request_queue_overflow_status_code_source_file;
     ngx_str_t restart_dir_source_file;
     ngx_str_t ruby_source_file;
+    ngx_str_t spawn_exception_status_code_source_file;
     ngx_str_t spawn_method_source_file;
     ngx_str_t start_timeout_source_file;
     ngx_str_t startup_file_source_file;
@@ -163,10 +167,12 @@ typedef struct {
     ngx_uint_t min_instances_source_line;
     ngx_uint_t monitor_log_file_source_line;
     ngx_uint_t nodejs_source_line;
+    ngx_uint_t preload_bundler_source_line;
     ngx_uint_t python_source_line;
     ngx_uint_t request_queue_overflow_status_code_source_line;
     ngx_uint_t restart_dir_source_line;
     ngx_uint_t ruby_source_line;
+    ngx_uint_t spawn_exception_status_code_source_line;
     ngx_uint_t spawn_method_source_line;
     ngx_uint_t start_timeout_source_line;
     ngx_uint_t startup_file_source_line;
@@ -216,10 +222,12 @@ typedef struct {
     ngx_int_t min_instances_explicitly_set;
     ngx_int_t monitor_log_file_explicitly_set;
     ngx_int_t nodejs_explicitly_set;
+    ngx_int_t preload_bundler_explicitly_set;
     ngx_int_t python_explicitly_set;
     ngx_int_t request_queue_overflow_status_code_explicitly_set;
     ngx_int_t restart_dir_explicitly_set;
     ngx_int_t ruby_explicitly_set;
+    ngx_int_t spawn_exception_status_code_explicitly_set;
     ngx_int_t spawn_method_explicitly_set;
     ngx_int_t start_timeout_explicitly_set;
     ngx_int_t startup_file_explicitly_set;

data/src/nginx_module/ngx_http_passenger_module.c

@@ -359,6 +359,7 @@ start_watchdog(ngx_cycle_t *cycle) {
     psg_json_value_set_str_ne    (w_config, "server_software", NGINX_VER, strlen(NGINX_VER));
     psg_json_value_set_bool      (w_config, "multi_app", 1);
     psg_json_value_set_bool      (w_config, "default_load_shell_envvars", 1);
+    psg_json_value_set_bool      (w_config, "default_preload_bundler", 0);
     psg_json_value_set_value     (w_config, "config_manifest", -1, passenger_main_conf.manifest);
     psg_json_value_set_ngx_uint  (w_config, "log_level", autogenerated_main_conf->log_level);
     psg_json_value_set_ngx_str_ne(w_config, "file_descriptor_log_target", &autogenerated_main_conf->file_descriptor_log_file);

data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/common.js

@@ -32,7 +32,7 @@ exports.setLevels = function (target, past, current, isDefault) {
   }
 
   target.levels = current || config.npm.levels;
-  if (target.padLevels) {
+  if (target.hasOwnProperty('padLevels') && target.padLevels) {
     target.levelLength = exports.longestElement(Object.keys(target.levels));
   }
 
@@ -77,20 +77,15 @@ exports.longestElement = function (xs) {
 // i.e. JSON objects that are either literals or objects (no Arrays, etc)
 //
 exports.clone = function (obj) {
-  //
-  // We only need to clone reference types (Object)
-  //
-  var copy = {};
-
   if (obj instanceof Error) {
     // With potential custom Error objects, this might not be exactly correct,
     // but probably close-enough for purposes of this lib.
-    copy = new Error(obj.message);
+    var copy = { message: obj.message };
     Object.getOwnPropertyNames(obj).forEach(function (key) {
       copy[key] = obj[key];
     });
 
-    return copy;
+    return cycle.decycle(copy);
   }
   else if (!(obj instanceof Object)) {
     return obj;
@@ -99,23 +94,34 @@ exports.clone = function (obj) {
     return new Date(obj.getTime());
   }
 
+  return clone(cycle.decycle(obj));
+};
+
+function clone(obj) {
+  //
+  // We only need to clone reference types (Object)
+  //
+  var copy = Array.isArray(obj) ? [] : {};
+
   for (var i in obj) {
-    if (Array.isArray(obj[i])) {
-      copy[i] = obj[i].slice(0);
-    }
-    else if (obj[i] instanceof Buffer) {
+    if (obj.hasOwnProperty(i)) {
+      if (Array.isArray(obj[i])) {
         copy[i] = obj[i].slice(0);
-    }
-    else if (typeof obj[i] != 'function') {
-      copy[i] = obj[i] instanceof Object ? exports.clone(obj[i]) : obj[i];
-    }
-    else if (typeof obj[i] === 'function') {
-      copy[i] = obj[i];
+      }
+      else if (obj[i] instanceof Buffer) {
+        copy[i] = obj[i].slice(0);
+      }
+      else if (typeof obj[i] != 'function') {
+        copy[i] = obj[i] instanceof Object ? exports.clone(obj[i]) : obj[i];
+      }
+      else if (typeof obj[i] === 'function') {
+        copy[i] = obj[i];
+      }
     }
   }
 
   return copy;
-};
+}
 
 //
 // ### function log (options)
@@ -139,8 +145,8 @@ exports.log = function (options) {
         : exports.timestamp,
       timestamp   = options.timestamp ? timestampFn() : null,
       showLevel   = options.showLevel === undefined ? true : options.showLevel,
-      meta        = options.meta !== null && options.meta !== undefined && !(options.meta instanceof Error)
-        ? exports.clone(cycle.decycle(options.meta))
+      meta        = options.meta !== null && options.meta !== undefined
+        ? exports.clone(options.meta)
         : options.meta || null,
       output;
 
@@ -214,6 +220,12 @@ exports.log = function (options) {
   // Remark: this should really be a call to `util.format`.
   //
   if (typeof options.formatter == 'function') {
+    options.meta = meta || options.meta;
+    if (options.meta instanceof Error) {
+      // Force converting the Error to an plain object now so it
+      // will not be messed up by decycle() when cloning options
+      options.meta = exports.clone(options.meta);
+    }
     return String(options.formatter(exports.clone(options)));
   }
 
@@ -232,10 +244,6 @@ exports.log = function (options) {
     : options.message;
 
   if (meta !== null && meta !== undefined) {
-    if (meta && meta instanceof Error && meta.stack) {
-      meta = meta.stack;
-    }
-
     if (typeof meta !== 'object') {
       output += ' ' + meta;
     }
@@ -246,7 +254,7 @@ exports.log = function (options) {
         output += ' ' + '\n' + util.inspect(meta, false, options.depth || null, options.colorize);
       } else if (
         options.humanReadableUnhandledException
-          && Object.keys(meta).length === 5
+          && Object.keys(meta).length >= 5
           && meta.hasOwnProperty('date')
           && meta.hasOwnProperty('process')
           && meta.hasOwnProperty('os')
@@ -260,7 +268,10 @@ exports.log = function (options) {
         delete meta.stack;
         delete meta.trace;
         output += ' ' + exports.serialize(meta);
-        output += '\n' + stack.join('\n');
+
+        if (stack) {
+          output += '\n' + stack.join('\n');
+        }
       } else {
         output += ' ' + exports.serialize(meta);
       }
@@ -308,6 +319,14 @@ exports.timestamp = function () {
 // logging to non-JSON inputs.
 //
 exports.serialize = function (obj, key) {
+  // symbols cannot be directly casted to strings
+  if (typeof key === 'symbol') {
+    key = key.toString()
+  }
+  if (typeof obj === 'symbol') {
+    obj = obj.toString()
+  }
+
   if (obj === null) {
     obj = 'null';
   }
@@ -365,7 +384,7 @@ exports.serialize = function (obj, key) {
 // `tail -f` a file. Options must include file.
 //
 exports.tailFile = function(options, callback) {
-  var buffer = new Buffer(64 * 1024)
+  var buffer = Buffer.alloc(64 * 1024)
     , decode = new StringDecoder('utf8')
     , stream = new Stream
     , buff = ''
@@ -396,7 +415,7 @@ exports.tailFile = function(options, callback) {
 
     (function read() {
       if (stream.destroyed) {
-        fs.close(fd);
+        fs.close(fd, nop);
         return;
       }
 
@@ -481,3 +500,5 @@ exports.stringArrayToSet = function (strArray, errMsg) {
     return set;
   }, Object.create(null));
 };
+
+function nop () {}

data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/cli-config.js

@@ -9,27 +9,27 @@
 var cliConfig = exports;
 
 cliConfig.levels = {
-  silly: 0,
-  input: 1,
-  verbose: 2,
-  prompt: 3,
-  debug: 4,
-  info: 5,
-  data: 6,
-  help: 7,
-  warn: 8,
-  error: 9
+  error: 0,
+  warn: 1,
+  help: 2,
+  data: 3,
+  info: 4,
+  debug: 5,
+  prompt: 6,
+  verbose: 7,
+  input: 8,
+  silly: 9,
 };
 
 cliConfig.colors = {
-  silly: 'magenta',
-  input: 'grey',
-  verbose: 'cyan',
-  prompt: 'grey',
-  debug: 'blue',
-  info: 'green',
-  data: 'grey',
-  help: 'cyan',
+  error: 'red',
   warn: 'yellow',
-  error: 'red'
-};
+  help: 'cyan',
+  data: 'grey',
+  info: 'green',
+  debug: 'blue',
+  prompt: 'grey',
+  verbose: 'cyan',
+  input: 'grey',
+  silly: 'magenta'
+};

data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/npm-config.js

@@ -9,19 +9,19 @@
 var npmConfig = exports;
 
 npmConfig.levels = {
-  silly: 0,
-  debug: 1,
-  verbose: 2,
-  info: 3,
-  warn: 4,
-  error: 5
+  error: 0,
+  warn: 1,
+  info: 2,
+  verbose: 3,
+  debug: 4,
+  silly: 5
 };
 
 npmConfig.colors = {
-  silly: 'magenta',
+  error: 'red',
+  warn: 'yellow',
+  info: 'green',
   verbose: 'cyan',
   debug: 'blue',
-  info: 'green',
-  warn: 'yellow',
-  error: 'red'
-};
+  silly: 'magenta'
+};

data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/syslog-config.js

@@ -16,7 +16,7 @@ syslogConfig.levels = {
   warning: 4,
   notice: 5,
   info: 6,
-  debug: 7,
+  debug: 7
 };
 
 syslogConfig.colors = {
@@ -27,5 +27,5 @@ syslogConfig.colors = {
   warning: 'red',
   notice: 'yellow',
   info: 'green',
-  debug: 'blue',
-};
+  debug: 'blue'
+};

data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config.js

@@ -8,6 +8,9 @@
 
 var colors = require('colors/safe');
 
+// Fix colors not appearing in non-tty environments
+colors.enabled = true;
+
 var config = exports,
     allColors = exports.allColors = {};
 
@@ -23,15 +26,18 @@ config.colorize = function (level, message) {
     for (var i = 0, l = allColors[level].length; i < l; ++i) {
       colorized = colors[allColors[level][i]](colorized);
     }
-  } else if (allColors[level].match(/\s/)) {
+  }
+  else if (allColors[level].match(/\s/)) {
     var colorArr = allColors[level].split(/\s+/);
     for (var i = 0; i < colorArr.length; ++i) {
       colorized = colors[colorArr[i]](colorized);
     }
     allColors[level] = colorArr;
-  } else {
+  }
+  else {
     colorized = colors[allColors[level]](colorized);
   }
+
   return colorized;
 };
 

data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/container.js

@@ -58,7 +58,7 @@ Container.prototype.get = Container.prototype.add = function (id, options) {
     }
 
     Object.keys(options).forEach(function (key) {
-      if (key === 'transports') {
+      if (key === 'transports' || key === 'filters' || key === 'rewriters') {
         return;
       }
 
@@ -73,6 +73,7 @@ Container.prototype.get = Container.prototype.add = function (id, options) {
       options.transports.push(new (winston.transports[name])(namedOptions));
     });
 
+    options.id = id;
     this.loggers[id] = new winston.Logger(options);
 
     this.loggers[id].on('close', function () {