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: SDK documentationhttp://cloud9-sdk.readme.io/v0.1/docs API documentationhttp://docs.c9.io/api User documentationhttp://docs.c9.io + User docs repohttps://github.com/c9/docs.c9.io 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.js b/plugins/c9.vfs.server/vfs.js index d75a8adc..9562eef9 100644 --- a/plugins/c9.vfs.server/vfs.js +++ b/plugins/c9.vfs.server/vfs.js @@ -19,11 +19,9 @@ function Vfs(vfs, master, options) { this.vfs = vfs; this.master = master; this.debug = options.debug || false; - this.logger = options.logger || {log: function(){}}; this.readonly = options.readonly || false; this.public = options.public || false; this.vfsOptions = options.vfsOptions || {}; - this.pid = this.vfsOptions.pid; var extendToken = options.extendToken; this.homeDir = options.homeDir; @@ -169,12 +167,6 @@ Vfs.prototype._createEngine = function(vfs, options) { that.socket.disconnect(); that.socket = socket; - socket.on('close', function (reason, description) { - var logMetadata = {collab: options.collab, reason: reason, description: description, id: that.id, sid: socket.id, pid: that.pid}; - console.log("Socket closed", logMetadata); - logMetadata.message = "Socket closed"; - that.logger.log(logMetadata); - }); var transport = new smith.EngineIoTransport(socket, true); var worker = new VfsWorker(vfs); @@ -193,10 +185,7 @@ Vfs.prototype._createEngine = function(vfs, options) { } worker.on("disconnect", function() { - var logMetadata = {collab: options.collab, id: that.id, sid: socket.id, pid: that.pid}; - console.log("VFS socket disconnect:", logMetadata); - logMetadata.message = "VFS socket disconnect"; - that.logger.log(logMetadata); + console.log("VFS socket disconnect:", options.collab, that.id, socket.id); if (options.collab) { if (collabApi) return disposeCollabClient();