Merge pull request #503 from CodeNow/monit

add socket monit back

Author: tjmehta

app.js

@@ -11,6 +11,7 @@ var Boom = require('dat-middleware').Boom;
 var activeApi = require('models/redis/active-api');
 var mongooseControl = require('models/mongo/mongoose-control');
 var envIs = require('101/env-is');
+var dogstatsd = require('models/datadog');
 
 if (process.env.NEWRELIC_KEY) {
   require('newrelic');
@@ -22,6 +23,9 @@ Api.prototype.start = function (cb) {
   debug('start');
   // start github ssh key generator
   keyGen.start();
+  // start sending socket count
+  dogstatsd.monitorStart();
+
   var count = createCount(callback);
   // connect to mongoose
   mongooseControl.start(count.inc.next);
@@ -65,6 +69,8 @@ Api.prototype.stop = function (cb) {
     var count = createCount(cb);
     // stop github ssh key generator
     keyGen.stop();
+    // stop sending socket count
+    dogstatsd.monitorStart();
     // express server
     mongooseControl.stop(count.inc().next);
     events.close(count.inc().next);

configs/.env

@@ -44,3 +44,4 @@ POLL_MONGO_TIMEOUT="30 minutes"
 GITHUB_SCOPE="user:email,repo,repo_deployment,read:repo_hook"
 GITHUB_HOOK_SECRET="3V3RYTHINGisAW3S0ME!"
 DOCKER_IMAGE_BUILDER_CACHE="/git-cache"
+MONITOR_INTERVAL="1 minute"

lib/express-app.js

@@ -17,8 +17,6 @@ if (envIs('production')) {
     'method':true,
     'tags': ['name:api', 'logType:express', 'env:'+process.env.NODE_ENV]
   }));
-
-  // app.use(dogstatsd.captureSocketCount);
 }
 
 if (envIs('development', 'local', 'stage')) {

lib/models/datadog/index.js

@@ -20,27 +20,41 @@ function captureSteamData (streamName, stream) {
   });
 }
 
-
-function captureSocketCount (req, res, next) {
+function captureSocketCount () {
   var sockets = require('http').globalAgent.sockets;
   var request = require('http').globalAgent.requests;
   var key;
 
   for (key in sockets) {
-    client.gauge('api.sockets_open', sockets[key].length, 1, ['target:'+key]);
+    client.gauge('api.sockets_open', sockets[key].length, 1,
+      ['target:'+key, 'pid:'+process.pid]);
   }
 
   for (key in request) {
-    client.gauge('api.sockets_pending', request[key].length, 1, ['target:'+key]);
+    client.gauge('api.sockets_pending', request[key].length, 1,
+      ['target:'+key, 'pid:'+process.pid]);
   }
 
   exec('lsof -p ' + process.pid + ' | wc -l', function (err, stdout) {
     if (err) { return; }
     client.gauge('api.openFiles', parseInt(stdout), 1, ['pid:'+process.pid]);
   });
+}
+
+var interval;
 
-  next();
+function monitorStart () {
+  if (interval) { return; }
+  interval = setInterval(captureSocketCount, process.env.MONITOR_INTERVAL);
+}
+
+function monitorStop () {
+  if (interval) {
+    clearInterval(interval);
+    interval = null;
+  }
 }
 
 module.exports.captureSteamData = captureSteamData;
-module.exports.captureSocketCount = captureSocketCount;
+module.exports.monitorStart = monitorStart;
+module.exports.monitorStop  = monitorStop;