From 078100aac8a1042c015f0c2be2f79f756926f65b Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 25 Feb 2016 16:01:13 -0500 Subject: [PATCH 1/5] chore(logging): output active handles per 10 minutes --- package.json | 1 + website/src/server.js | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/package.json b/package.json index ea497f587d..01f8d6bd83 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "version": "0.0.0-152", "main": "./website/src/server.js", "dependencies": { + "active-handles": "^1.1.0", "amazon-payments": "0.0.4", "amplitude": "^2.0.3", "async": "~0.9.0", diff --git a/website/src/server.js b/website/src/server.js index 494febfb97..f95a89323d 100644 --- a/website/src/server.js +++ b/website/src/server.js @@ -10,6 +10,7 @@ var isProd = nconf.get('NODE_ENV') === 'production'; var isDev = nconf.get('NODE_ENV') === 'development'; var DISABLE_LOGGING = nconf.get('DISABLE_REQUEST_LOGGING'); var cores = +nconf.get("WEB_CONCURRENCY") || 0; +var activeHandles = require('active-handles'); if (cores!==0 && cluster.isMaster && (isDev || isProd)) { // Fork workers. If config.json has CORES=x, use that - otherwise, use all cpus-1 (production) @@ -161,4 +162,10 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) { }); module.exports = server; + + var activeHandleInterval = setInterval(logHandles,600000); + + function logHandles() { + activeHandles.print(); + } } From bff5258a56e44dd2f17fe8d7577223e08fc1c223 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 25 Feb 2016 16:11:02 -0500 Subject: [PATCH 2/5] fix(logging): get interval from env var --- website/src/server.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/website/src/server.js b/website/src/server.js index f95a89323d..3df980b201 100644 --- a/website/src/server.js +++ b/website/src/server.js @@ -163,7 +163,8 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) { module.exports = server; - var activeHandleInterval = setInterval(logHandles,600000); + var logHandlesInterval = +nconf.get('LOG_HANDLES_INTERVAL') || 60000; + var activeHandleInterval = setInterval(logHandles, logHandlesInterval); function logHandles() { activeHandles.print(); From a698559c0468d1dcbdf8098cd57ae573fbc0d04d Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 26 Feb 2016 13:28:44 -0500 Subject: [PATCH 3/5] fix(log-handles): don't log verbose code --- website/src/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/src/server.js b/website/src/server.js index 3df980b201..bf803385bb 100644 --- a/website/src/server.js +++ b/website/src/server.js @@ -167,6 +167,6 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) { var activeHandleInterval = setInterval(logHandles, logHandlesInterval); function logHandles() { - activeHandles.print(); + activeHandles.print({highlight:false}); } } From c761944c3536a4c4647dde8d2f890d11fa5547d9 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Wed, 2 Mar 2016 10:22:46 -0500 Subject: [PATCH 4/5] feat(logging): timestamp active handles output --- website/src/server.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/src/server.js b/website/src/server.js index bf803385bb..80d9cd68e7 100644 --- a/website/src/server.js +++ b/website/src/server.js @@ -11,6 +11,7 @@ var isDev = nconf.get('NODE_ENV') === 'development'; var DISABLE_LOGGING = nconf.get('DISABLE_REQUEST_LOGGING'); var cores = +nconf.get("WEB_CONCURRENCY") || 0; var activeHandles = require('active-handles'); +var moment = require('moment'); if (cores!==0 && cluster.isMaster && (isDev || isProd)) { // Fork workers. If config.json has CORES=x, use that - otherwise, use all cpus-1 (production) @@ -167,6 +168,7 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) { var activeHandleInterval = setInterval(logHandles, logHandlesInterval); function logHandles() { + console.log(moment().format()); activeHandles.print({highlight:false}); } } From af38e83e365135a3782f600d2546c51a021ae446 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Wed, 2 Mar 2016 11:30:49 -0500 Subject: [PATCH 5/5] fix(logging): don't log without env var --- website/src/server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/src/server.js b/website/src/server.js index 80d9cd68e7..8fc8cce0b1 100644 --- a/website/src/server.js +++ b/website/src/server.js @@ -164,8 +164,8 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) { module.exports = server; - var logHandlesInterval = +nconf.get('LOG_HANDLES_INTERVAL') || 60000; - var activeHandleInterval = setInterval(logHandles, logHandlesInterval); + var logHandlesInterval = +nconf.get('LOG_HANDLES_INTERVAL'); + if (logHandlesInterval) { var activeHandleInterval = setInterval(logHandles, logHandlesInterval); } function logHandles() { console.log(moment().format());