From b22ebc80c757ca05e6710b7ae813101b919c28db Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Fri, 28 Aug 2015 10:07:35 +0000 Subject: [PATCH 1/4] Adding some more vfs logging and sending logs to loggly. --- package.json | 2 +- plugins/c9.vfs.server/vfs.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 2bf04ef8..463f9233 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "c9.ide.language.javascript.tern": "#9bf164ec27", "c9.ide.language.javascript.infer": "#8478e3c702", "c9.ide.language.jsonalyzer": "#e0d94eda4f", - "c9.ide.collab": "#c74666f592", + "c9.ide.collab": "#0b544d0b35", "c9.ide.local": "#a9703b630c", "c9.ide.find": "#e073bf251a", "c9.ide.find.infiles": "#c132ad243c", diff --git a/plugins/c9.vfs.server/vfs.js b/plugins/c9.vfs.server/vfs.js index 4a08c342..9759366b 100644 --- a/plugins/c9.vfs.server/vfs.js +++ b/plugins/c9.vfs.server/vfs.js @@ -11,8 +11,6 @@ var wrapVfs = require("./vfs_wrapper"); var proxyVfs = require("./vfs_proxy"); var urlParse = require('url').parse; -module.exports = Vfs; - function Vfs(vfs, master, options) { EventEmitter.call(this); @@ -127,7 +125,9 @@ Vfs.prototype._watchConnection = function(pid) { } function onStderr(data) { // @todo collab stderr logs - console.log("VFS stderr [" + pid + "]: " + data); + var logMessage = "VFS stderr [" + pid + "]: " + data + console.log(logMessage); + that.logger.log(logMessage); } master.on("disconnect", onError); From 3bd69d7e210c512c0840a9364d3d3b91cba02a48 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Fri, 28 Aug 2015 10:13:15 +0000 Subject: [PATCH 2/4] Log improvements --- plugins/c9.vfs.server/vfs.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/c9.vfs.server/vfs.js b/plugins/c9.vfs.server/vfs.js index 9759366b..2dcd1506 100644 --- a/plugins/c9.vfs.server/vfs.js +++ b/plugins/c9.vfs.server/vfs.js @@ -125,9 +125,8 @@ Vfs.prototype._watchConnection = function(pid) { } function onStderr(data) { // @todo collab stderr logs - var logMessage = "VFS stderr [" + pid + "]: " + data - console.log(logMessage); - that.logger.log(logMessage); + console.log("VFS stderr [" + pid + "]: " + data); + that.logger.log({message: data, pid: pid}); } master.on("disconnect", onError); From 93e9bd8c5e877725886b8702deb67157d3de5d73 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Fri, 28 Aug 2015 10:13:44 +0000 Subject: [PATCH 3/4] Didn't mean to remove that --- plugins/c9.vfs.server/vfs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/c9.vfs.server/vfs.js b/plugins/c9.vfs.server/vfs.js index 2dcd1506..46f6b6c5 100644 --- a/plugins/c9.vfs.server/vfs.js +++ b/plugins/c9.vfs.server/vfs.js @@ -11,6 +11,8 @@ var wrapVfs = require("./vfs_wrapper"); var proxyVfs = require("./vfs_proxy"); var urlParse = require('url').parse; +module.exports = Vfs; + function Vfs(vfs, master, options) { EventEmitter.call(this); From 6a3814db50e34410a3409fe85ca60251e3aef983 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Fri, 28 Aug 2015 10:26:37 +0000 Subject: [PATCH 4/4] minor fixes --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 463f9233..c9916b6e 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "c9.ide.language.javascript.tern": "#9bf164ec27", "c9.ide.language.javascript.infer": "#8478e3c702", "c9.ide.language.jsonalyzer": "#e0d94eda4f", - "c9.ide.collab": "#0b544d0b35", + "c9.ide.collab": "#29ee850420", "c9.ide.local": "#a9703b630c", "c9.ide.find": "#e073bf251a", "c9.ide.find.infiles": "#c132ad243c",