From 0df412d2419ce7ef4c19d442ee3dcb727433c6ee Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Tue, 1 Apr 2014 16:51:20 +0100
Subject: [PATCH] Improve granularity and length of client side logs

---
 services/web/public/coffee/editor/Document.coffee   | 12 ++++++++++--
 services/web/public/coffee/editor/ShareJsDoc.coffee |  9 +++++++--
 services/web/public/coffee/ide.coffee               |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/services/web/public/coffee/editor/Document.coffee b/services/web/public/coffee/editor/Document.coffee
index a3df34f4d7..a316ab5961 100644
--- a/services/web/public/coffee/editor/Document.coffee
+++ b/services/web/public/coffee/editor/Document.coffee
@@ -153,14 +153,22 @@ define [
 				@ide.pushEvent "remoteop",
 					doc_id: @doc_id
 				@trigger "remoteop"
-			@doc.on "op:sent", () => 
+			@doc.on "op:sent", (op) =>
 				@ide.pushEvent "op:sent",
 					doc_id: @doc_id
+					op: op
 				@trigger "op:sent"
-			@doc.on "op:acknowledged", () =>
+			@doc.on "op:acknowledged", (op) =>
 				@ide.pushEvent "op:acknowledged",
 					doc_id: @doc_id
+					op: op
 				@trigger "op:acknowledged"
+			@doc.on "flush", (inflightOp, pendingOp, version) =>
+				@ide.pushEvent "flush",
+					doc_id: @doc_id,
+					inflightOp: inflightOp,
+					pendingOp: pendingOp
+					v: version
 
 		_onError: (error, meta = {}) ->
 			console.error "ShareJS error", error, meta
diff --git a/services/web/public/coffee/editor/ShareJsDoc.coffee b/services/web/public/coffee/editor/ShareJsDoc.coffee
index 78d3232994..1a0f2e9f02 100644
--- a/services/web/public/coffee/editor/ShareJsDoc.coffee
+++ b/services/web/public/coffee/editor/ShareJsDoc.coffee
@@ -109,11 +109,16 @@ define [
 		_bindToDocChanges: (doc) ->
 			submitOp = doc.submitOp
 			doc.submitOp = (args...) =>
-				@trigger "op:sent"
+				@trigger "op:sent", args...
 				doc.pendingCallbacks.push () =>
-					@trigger "op:acknowledged"
+					@trigger "op:acknowledged", args...
 				submitOp.apply(doc, args)
 
+			flush = doc.flush
+			doc.flush = (args...) =>
+				@trigger "flush", doc.inflightOp, doc.pendingOp, doc.version
+				flush.apply(doc, args)
+
 	_.extend(ShareJsDoc::, Backbone.Events)
 
 	return ShareJsDoc
diff --git a/services/web/public/coffee/ide.coffee b/services/web/public/coffee/ide.coffee
index ed7d6ff5f5..e58a5cc27b 100644
--- a/services/web/public/coffee/ide.coffee
+++ b/services/web/public/coffee/ide.coffee
@@ -165,7 +165,7 @@ define [
 
 		pushEvent: (type, meta = {}) ->
 			@recentEvents.push type: type, meta: meta, date: new Date()
-			if @recentEvents.length > 10
+			if @recentEvents.length > 40
 				@recentEvents.shift()
 
 		reportError: (error, meta = {}) ->