From d79793c34fac16b2fb7dbb1e567be1308f987cdb Mon Sep 17 00:00:00 2001 From: James Allen Date: Sat, 29 Aug 2015 08:22:43 +0100 Subject: [PATCH 1/2] Monitor get document times --- services/real-time/app/coffee/DocumentUpdaterManager.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/real-time/app/coffee/DocumentUpdaterManager.coffee b/services/real-time/app/coffee/DocumentUpdaterManager.coffee index 8610b454ec..1bc9fd3bc9 100644 --- a/services/real-time/app/coffee/DocumentUpdaterManager.coffee +++ b/services/real-time/app/coffee/DocumentUpdaterManager.coffee @@ -7,11 +7,11 @@ rclient = redis.createClient(settings.redis.web) module.exports = DocumentUpdaterManager = getDocument: (project_id, doc_id, fromVersion, callback = (error, exists, doclines, version) ->) -> - #timer = new metrics.Timer("get-document") + timer = new metrics.Timer("get-document") url = "#{settings.apis.documentupdater.url}/project/#{project_id}/doc/#{doc_id}?fromVersion=#{fromVersion}" logger.log {project_id, doc_id, fromVersion}, "getting doc from document updater" request.get url, (err, res, body) -> - #timer.done() + timer.done() if err? logger.error {err, url, project_id, doc_id}, "error getting doc from doc updater" return callback(err) @@ -55,4 +55,4 @@ module.exports = DocumentUpdaterManager = multi.rpush "pending-updates-list", doc_key multi.exec (error) -> return callback(error) if error? - callback() \ No newline at end of file + callback() From 3c70acd560a100d5cccb17ad49b7e3bf591ea359 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Sat, 29 Aug 2015 08:26:01 +0100 Subject: [PATCH 2/2] added metrics into realtime around doc update manager --- services/real-time/app/coffee/DocumentUpdaterManager.coffee | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/real-time/app/coffee/DocumentUpdaterManager.coffee b/services/real-time/app/coffee/DocumentUpdaterManager.coffee index 1bc9fd3bc9..a2c9fe54f8 100644 --- a/services/real-time/app/coffee/DocumentUpdaterManager.coffee +++ b/services/real-time/app/coffee/DocumentUpdaterManager.coffee @@ -1,6 +1,7 @@ request = require "request" logger = require "logger-sharelatex" settings = require "settings-sharelatex" +metrics = require("metrics-sharelatex") redis = require("redis-sharelatex") rclient = redis.createClient(settings.redis.web) @@ -30,10 +31,10 @@ module.exports = DocumentUpdaterManager = flushProjectToMongoAndDelete: (project_id, callback = ()->) -> logger.log project_id:project_id, "deleting project from document updater" - #timer = new metrics.Timer("delete.mongo.project") + timer = new metrics.Timer("delete.mongo.project") url = "#{settings.apis.documentupdater.url}/project/#{project_id}" request.del url, (err, res, body)-> - #timer.done() + timer.done() if err? logger.error {err, project_id}, "error deleting project from document updater" return callback(err)