diff --git a/NEWS.md b/NEWS.md index 1c067382..e85e78d9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,9 @@ Announcements: - Upgrades windshaft to 0.32.1 +Bugfixes: + - Closes fd for log files on `kill -HUP` (#230) + 1.21.0 -- 2014-10-24 -------------------- diff --git a/app.js b/app.js index d60bdfd3..61d3dfad 100755 --- a/app.js +++ b/app.js @@ -116,8 +116,11 @@ process.on('SIGUSR2', function() { }); 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'); + }); }); process.on('uncaughtException', function(err) { diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index bc6c348b..76bc76f1 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -67,7 +67,7 @@ }, "log4js": { "version": "0.6.21", - "from": "log4js@~0.6.17", + "from": "https://github.com/CartoDB/log4js-node/tarball/cdb", "resolved": "https://github.com/CartoDB/log4js-node/tarball/cdb", "dependencies": { "async": { @@ -1658,7 +1658,7 @@ }, "sphericalmercator": { "version": "1.0.2", - "from": "sphericalmercator@~1.0.2" + "from": "sphericalmercator@~1.0.1" } } }, diff --git a/package.json b/package.json index 7846124e..7636aee2 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "cartodb-psql": "https://github.com/CartoDB/node-cartodb-psql/tarball/0.4.0", "redis-mpool": "https://github.com/CartoDB/node-redis-mpool/tarball/0.3.0", "lzma": "~1.3.7", - "log4js": "~0.6.17", + "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb", "rollbar": "~0.3.13" }, "devDependencies": {