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);