From 3b0b0199ea8e6ed995fd004f166a28446ee996c5 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@c9.io>
Date: Tue, 10 Feb 2015 11:45:13 +0000
Subject: [PATCH] Fix logging with vfs disconnections

---
 README.md                                  |  3 ++-
 package.json                               |  2 +-
 plugins/c9.error/raygun.connect.js         |  5 -----
 plugins/c9.ide.plugins/debug.js            | 10 ++++------
 plugins/c9.ide.plugins/loader.js           |  8 +++-----
 plugins/c9.vfs.server/vfs.connect.local.js |  4 +++-
 6 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 95a2bf6f..0a8bb88f 100644
--- a/README.md
+++ b/README.md
@@ -21,10 +21,11 @@ We have several documentation resources for you:
     <tr><th>SDK documentation</th><td>http://cloud9-sdk.readme.io/v0.1/docs</td></tr>
     <tr><th>API documentation</th><td>http://docs.c9.io/api</td></tr>
     <tr><th>User documentation</th><td>http://docs.c9.io</td></tr>
+    <tr><th>User docs repo</th><td>https://github.com/c9/docs.c9.io</td></tr>
 </table>
 
 Please joing the mailinglist to get support or give support to the growing community of plugin developers:
-https://groups.google.com/forum/#!forum/cloud9-sdk
+https://groups.google.com/forum/#!forum/cloud9-plugin-development
 
 #### Installation ####
 
diff --git a/package.json b/package.json
index ebb512b7..2719bccc 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
         "c9.ide.find": "#be3bca94b7",
         "c9.ide.find.infiles": "#462928475c",
         "c9.ide.find.replace": "#fe41fa768d",
-        "c9.ide.run.debug": "#9a05fadc55",
+        "c9.ide.run.debug": "#b734a2a47f",
         "c9.ide.ace.emmet": "#e5f1a92ac3",
         "c9.ide.ace.gotoline": "#4d1a93172c",
         "c9.ide.ace.keymaps": "#422e83553b",
diff --git a/plugins/c9.error/raygun.connect.js b/plugins/c9.error/raygun.connect.js
index 37848ec3..d2793f39 100644
--- a/plugins/c9.error/raygun.connect.js
+++ b/plugins/c9.error/raygun.connect.js
@@ -71,11 +71,6 @@ function plugin(options, imports, register) {
                 email: req.user.email
             };
         }
-        else if (req.session) {
-            customData.user = {
-                id: req.session.uid
-            };
-        }
 
         raygunClient.send(err, customData, function() {}, {
             host: parsedUrl.hostname,
diff --git a/plugins/c9.ide.plugins/debug.js b/plugins/c9.ide.plugins/debug.js
index bf7dd44b..b251e6a7 100644
--- a/plugins/c9.ide.plugins/debug.js
+++ b/plugins/c9.ide.plugins/debug.js
@@ -139,12 +139,10 @@ define(function(require, exports, module) {
                         watch("~/.c9/plugins/" + pluginPath);
                         
                         var cfg = options.plugins[path];
-                        var host = vfs.baseUrl + "/";
-                        var base = join(String(c9.projectId), 
-                            "plugins", auth.accessToken);
-                            
-                        cfg.packagePath = host + join(base, pluginPath.replace(/^plugins\//, ""));
-                        cfg.staticPrefix = host + join(base, name);
+                        cfg.packagePath = join(vfs.baseUrl, c9.projectId, "plugins", 
+                            auth.accessToken, pluginPath.replace(/^plugins\//, ""));
+                        cfg.staticPrefix = join(vfs.baseUrl, c9.projectId, "plugins", 
+                            auth.accessToken, name);
                         cfg.apikey = "0000000000000000000000000000=";
                         
                         config.push(cfg);
diff --git a/plugins/c9.ide.plugins/loader.js b/plugins/c9.ide.plugins/loader.js
index 45c5a41b..d6320a8c 100644
--- a/plugins/c9.ide.plugins/loader.js
+++ b/plugins/c9.ide.plugins/loader.js
@@ -66,11 +66,9 @@ define(function(require, exports, module) {
                 names.push(name);
                 
                 var path = options.packagePath + ".js";
-                var host = vfs.baseUrl + "/";
-                var base = join(String(c9.projectId), "plugins", auth.accessToken);
-                            
-                options.packagePath = host + join(base, path.replace(/^plugins\//, ""));
-                options.staticPrefix = host + join(base, name);
+                var base = join(vfs.baseUrl, c9.projectId, "plugins", auth.accessToken);
+                options.packagePath = join(base, path.replace(/^plugins\//, ""));
+                options.staticPrefix = join(base, name);
                 
                 if (!options.setup) {
                     wait++;
diff --git a/plugins/c9.vfs.server/vfs.connect.local.js b/plugins/c9.vfs.server/vfs.connect.local.js
index 5189ccd0..e34ab4b2 100644
--- a/plugins/c9.vfs.server/vfs.connect.local.js
+++ b/plugins/c9.vfs.server/vfs.connect.local.js
@@ -1,12 +1,13 @@
 define(function(require, exports, module) {
     "use strict";
     
-    main.consumes = ["Plugin"];
+    main.consumes = ["Plugin", "logger"];
     main.provides = ["vfs.connect"];
     return main;
 
     function main(options, imports, register) {
         var Plugin = imports.Plugin;
+        var logger = imports.logger;
     
         var Vfs = require("./vfs");
         var localFs = require("vfs-local");
@@ -45,6 +46,7 @@ define(function(require, exports, module) {
 
             callback(null, new Vfs(localFs(vfsOptions), master, {
                 debug: options.debug || false,
+                logger: logger,
                 homeDir: vfsOptions.homeDir,
                 projectDir: vfsOptions.projectDir,
                 extendDirectory: options.extendDirectory,