James Allen 12 лет назад
Родитель
Сommit
76f929f415
2 измененных файлов с 7 добавлено и 4 удалено
  1. 6 4
      services/filestore/app.coffee
  2. 1 0
      services/filestore/package.json

+ 6 - 4
services/filestore/app.coffee

@@ -1,7 +1,6 @@
 express = require('express')
 express = require('express')
 logger = require('logger-sharelatex')
 logger = require('logger-sharelatex')
 logger.initialize("filestore")
 logger.initialize("filestore")
-metrics = require("./app/js/metrics")
 settings = require("settings-sharelatex")
 settings = require("settings-sharelatex")
 request = require("request")
 request = require("request")
 fileController = require("./app/js/FileController")
 fileController = require("./app/js/FileController")
@@ -11,9 +10,13 @@ appIsOk = true
 app = express()
 app = express()
 streamBuffers = require("stream-buffers")
 streamBuffers = require("stream-buffers")
 
 
+Metrics = require "metrics-sharelatex"
+Metrics.initialize("filestore")
+Metrics.open_sockets.monitor(logger)
 
 
 app.configure ->
 app.configure ->
 	app.use express.bodyParser()
 	app.use express.bodyParser()
+	app.use Metrics.http.monitor(logger)
 	
 	
 app.configure 'development', ->
 app.configure 'development', ->
 	console.log "Development Enviroment"
 	console.log "Development Enviroment"
@@ -21,13 +24,12 @@ app.configure 'development', ->
 
 
 app.configure 'production', ->
 app.configure 'production', ->
 	console.log "Production Enviroment"
 	console.log "Production Enviroment"
-	app.use express.logger()
 	app.use express.errorHandler()
 	app.use express.errorHandler()
 
 
-metrics.inc "startup"
+Metrics.inc "startup"
 
 
 app.use (req, res, next)->
 app.use (req, res, next)->
-	metrics.inc "http-request"
+	Metrics.inc "http-request"
 	next()
 	next()
 
 
 app.use (req, res, next) ->
 app.use (req, res, next) ->

+ 1 - 0
services/filestore/package.json

@@ -4,6 +4,7 @@
   "dependencies": {
   "dependencies": {
     "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#master",
     "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#master",
     "logger-sharelatex": "git+https://github.com/sharelatex/logger-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",
     "request": "2.14.0",
     "lynx": "0.0.11",
     "lynx": "0.0.11",
     "grunt-mocha-test": "~0.8.2",
     "grunt-mocha-test": "~0.8.2",