From 76f929f4158a0f45fbcd6b122dfa671c32fc7a69 Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 9 May 2014 13:30:35 +0100 Subject: [PATCH] Add in new http monitoring --- services/filestore/app.coffee | 10 ++++++---- services/filestore/package.json | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/services/filestore/app.coffee b/services/filestore/app.coffee index 0e405d6e34..d5d0e1a459 100644 --- a/services/filestore/app.coffee +++ b/services/filestore/app.coffee @@ -1,7 +1,6 @@ express = require('express') logger = require('logger-sharelatex') logger.initialize("filestore") -metrics = require("./app/js/metrics") settings = require("settings-sharelatex") request = require("request") fileController = require("./app/js/FileController") @@ -11,9 +10,13 @@ appIsOk = true app = express() streamBuffers = require("stream-buffers") +Metrics = require "metrics-sharelatex" +Metrics.initialize("filestore") +Metrics.open_sockets.monitor(logger) app.configure -> app.use express.bodyParser() + app.use Metrics.http.monitor(logger) app.configure 'development', -> console.log "Development Enviroment" @@ -21,13 +24,12 @@ app.configure 'development', -> app.configure 'production', -> console.log "Production Enviroment" - app.use express.logger() app.use express.errorHandler() -metrics.inc "startup" +Metrics.inc "startup" app.use (req, res, next)-> - metrics.inc "http-request" + Metrics.inc "http-request" next() app.use (req, res, next) -> diff --git a/services/filestore/package.json b/services/filestore/package.json index 029b1e97e5..f60ad6d2c9 100644 --- a/services/filestore/package.json +++ b/services/filestore/package.json @@ -4,6 +4,7 @@ "dependencies": { "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#master", "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#master", + "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#master", "request": "2.14.0", "lynx": "0.0.11", "grunt-mocha-test": "~0.8.2",