Merge branch 'master' into 188-close-stream-responses-on-error

Conflicts:
	NEWS.md

NEWS.md

@@ -4,6 +4,7 @@
 Bug fixes:
 
  * Closes stream responses on error (#188)
+ * Closes fd for log files on `kill -HUP` (#187)
 
 
 1.19.0 - 2014-11-21

app.js

@@ -85,6 +85,9 @@ process.on('uncaughtException', function(err) {
 });
 
 process.on('SIGHUP', function() {
-    log4js.configure(log4js_config);
-    console.log('Log files reloaded');
+    global.log4js.clearAndShutdownAppenders(function() {
+        global.log4js.configure(log4js_config);
+        global.logger = log4js.getLogger();
+        console.log('Log files reloaded');
+    });
 });

npm-shrinkwrap.json

@@ -106,8 +106,8 @@
     },
     "log4js": {
       "version": "0.6.21",
-      "from": "log4js@~0.6.18",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.21.tgz",
+      "from": "https://github.com/CartoDB/log4js-node/tarball/cdb",
+      "resolved": "https://github.com/CartoDB/log4js-node/tarball/cdb",
       "dependencies": {
         "async": {
           "version": "0.2.10",
@@ -125,7 +125,8 @@
             },
             "isarray": {
               "version": "0.0.1",
-              "from": "isarray@0.0.1"
+              "from": "isarray@0.0.1",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
             },
             "string_decoder": {
               "version": "0.10.31",
@@ -202,6 +203,7 @@
         "optimist": {
           "version": "0.3.5",
           "from": "optimist@0.3.5",
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.5.tgz",
           "dependencies": {
             "wordwrap": {
               "version": "0.0.2",

package.json

@@ -25,7 +25,7 @@
         "topojson": "0.0.8",
         "oauth-client": "0.3.0",
         "lru-cache":"~2.5.0",
-        "log4js": "~0.6.18",
+        "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb",
         "rollbar": "~0.3.2",
         "node-statsd": "~0.0.7"
     },