Add more counters for diagnostic information

src/counters.js

@@ -1,5 +1,7 @@
 var Logger = require('./logger');
 var counterLog = new Logger.Logger('counters.log');
+import os from 'os';
+import io from 'socket.io';
 
 var counters = {};
 
@@ -16,6 +18,13 @@ exports.add = function (counter, value) {
 };
 
 setInterval(function () {
-    counterLog.log(JSON.stringify(counters));
+    try {
+        counters['memory:rss'] = process.memoryUsage().rss / 1048576;
+        counters['load:1min'] = os.loadavg()[0];
+        counters['socket.io:count'] = io.instance.sockets.length;
+        counterLog.log(JSON.stringify(counters));
+    } catch (e) {
+        Logger.errlog.log(e.stack);
+    }
     counters = {};
 }, 60000);

src/io/ioserver.js

@@ -14,6 +14,7 @@ var util = require("../utilities");
 var crypto = require("crypto");
 var isTorExit = require("../tor").isTorExit;
 var session = require("../session");
+import counters from '../counters';
 
 var CONNECT_RATE = {
     burst: 5,
@@ -77,6 +78,7 @@ function ipLimitReached(sock) {
     var ip = sock._realip;
 
     sock.on("disconnect", function () {
+        counters.add("socket.io:disconnect", 1);
         ipCount[ip]--;
         if (ipCount[ip] === 0) {
             /* Clear out unnecessary counters to save memory */
@@ -169,6 +171,7 @@ function handleConnection(sock) {
     }
 
     Logger.syslog.log("Accepted socket from " + ip);
+    counters.add("socket.io:accept", 1);
 
     addTypecheckedFunctions(sock);
 

src/web/webserver.js

@@ -16,6 +16,7 @@ var morgan = require("morgan");
 var session = require("../session");
 var csrf = require("./csrf");
 var XSS = require("../xss");
+import counters from "../counters";
 
 const LOG_FORMAT = ':real-address - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"';
 morgan.token('real-address', function (req) { return req._ip; });
@@ -187,6 +188,7 @@ module.exports = {
      */
     init: function (app) {
         app.use(function (req, res, next) {
+            counters.add("http:request", 1);
             req._ip = ipForRequest(req);
             next();
         });