diff --git a/configs/client-default.js b/configs/client-default.js index ea4f66e0..3c5cbac5 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -156,10 +156,6 @@ module.exports = function(options) { staticPrefix: staticPrefix + "/plugins/c9.ide.layout.classic", defaultShow: options.local }, - { - packagePath: "plugins/c9.ide.metrics/metrics", - hosted: hosted - }, // Ace && Commands "plugins/c9.ide.keys/commands", diff --git a/configs/standalone.js b/configs/standalone.js index 7cad6942..22a63d77 100644 --- a/configs/standalone.js +++ b/configs/standalone.js @@ -150,7 +150,6 @@ module.exports = function(config, optimist) { "./c9.nodeapi/nodeapi", { packagePath: "./c9.vfs.standalone/standalone", - sdk: config.sdk, local: config.local, packed: argv.packed, collab: config.collab, diff --git a/package.json b/package.json index 18807e8b..fe7e1be2 100644 --- a/package.json +++ b/package.json @@ -66,6 +66,7 @@ "c9.ide.find.infiles": "#1b83cf12f1", "c9.ide.find.replace": "#e4daf722b8", "c9.ide.run.debug": "#638e6b00b3", + "c9.automate": "#86bf1ee1ca", "c9.ide.ace.emmet": "#e5f1a92ac3", "c9.ide.ace.gotoline": "#4d1a93172c", "c9.ide.ace.keymaps": "#6c4bb65b1f", diff --git a/plugins/c9.ide.errorhandler/raygun_error_handler.js b/plugins/c9.ide.errorhandler/raygun_error_handler.js index 12be8f71..43e46239 100644 --- a/plugins/c9.ide.errorhandler/raygun_error_handler.js +++ b/plugins/c9.ide.errorhandler/raygun_error_handler.js @@ -75,9 +75,7 @@ define(function(require, exports, module) { /***** Register and define API *****/ plugin.freezePublicAPI({ - /** @deprecated Use log() instead. */ - reportError: reportError, - log: reportError + reportError: reportError }); register(null, { "error_handler" : plugin }); diff --git a/plugins/c9.ide.errorhandler/simple_error_handler.js b/plugins/c9.ide.errorhandler/simple_error_handler.js index 36f530d1..d9b71362 100644 --- a/plugins/c9.ide.errorhandler/simple_error_handler.js +++ b/plugins/c9.ide.errorhandler/simple_error_handler.js @@ -108,9 +108,7 @@ define(function(require, exports, module) { /***** Register and define API *****/ plugin.freezePublicAPI({ - /** @deprecated Use log() instead. */ - reportError: reportError, - log: reportError + reportError: reportError }); register(null, { "error_handler" : plugin }); diff --git a/plugins/c9.nodeapi/util.js b/plugins/c9.nodeapi/util.js index 9628e42c..9fbff737 100644 --- a/plugins/c9.nodeapi/util.js +++ b/plugins/c9.nodeapi/util.js @@ -463,9 +463,7 @@ function isPrimitive(arg) { exports.isPrimitive = isPrimitive; function isBuffer(arg) { - // Not relevant outside of node - // return arg instanceof Buffer; - return false; + return arg instanceof Buffer; } exports.isBuffer = isBuffer; diff --git a/plugins/c9.vfs.client/endpoint.js b/plugins/c9.vfs.client/endpoint.js index 1ed7ee29..102b5723 100644 --- a/plugins/c9.vfs.client/endpoint.js +++ b/plugins/c9.vfs.client/endpoint.js @@ -1,7 +1,7 @@ define(function(require, exports, module) { "use strict"; - main.consumes = ["Plugin", "auth", "http", "api", "error_handler", "metrics"]; + main.consumes = ["Plugin", "auth", "http", "api", "error_handler"]; main.provides = ["vfs.endpoint"]; return main; @@ -11,7 +11,6 @@ define(function(require, exports, module) { var http = imports.http; var api = imports.api; var errorHandler = imports.error_handler; - var metrics = imports.metrics; /***** Initialization *****/ @@ -169,10 +168,8 @@ define(function(require, exports, module) { // just take the first server that doesn't return an error (function tryNext(i) { - if (i >= servers.length) { - metrics.increment("connect_failed_all", 1, true); + if (i >= servers.length) return callback(new Error("Disconnected: Could not reach your workspace. Please try again later.")); - } var server = servers[i]; auth.request(server.url + "/" + options.pid, { diff --git a/plugins/c9.vfs.client/vfs.ping.js b/plugins/c9.vfs.client/vfs.ping.js index fcebcf6e..13ae4c44 100644 --- a/plugins/c9.vfs.client/vfs.ping.js +++ b/plugins/c9.vfs.client/vfs.ping.js @@ -1,7 +1,7 @@ define(function(require, exports, module) { "use strict"; - main.consumes = ["Plugin", "ext", "c9", "vfs", "metrics"]; + main.consumes = ["Plugin", "ext", "c9", "vfs"]; main.provides = ["vfs.ping"]; return main; @@ -9,7 +9,6 @@ define(function(require, exports, module) { var Plugin = imports.Plugin; var c9 = imports.c9; var ext = imports.ext; - var metrics = imports.metrics; /***** Initialization *****/ diff --git a/plugins/c9.vfs.client/vfs_client.js b/plugins/c9.vfs.client/vfs_client.js index 0398223f..b44e2c30 100644 --- a/plugins/c9.vfs.client/vfs_client.js +++ b/plugins/c9.vfs.client/vfs_client.js @@ -7,10 +7,7 @@ define(function(require, exports, module) { "use strict"; - main.consumes = [ - "Plugin", "auth", "vfs.endpoint", "dialog.error", - "dialog.alert", "error_handler", "metrics" - ]; + main.consumes = ["Plugin", "auth", "vfs.endpoint", "dialog.error", "dialog.alert", "error_handler"]; main.provides = ["vfs"]; return main; @@ -37,7 +34,6 @@ define(function(require, exports, module) { var hideError = errorDialog.hide; var showAlert = imports["dialog.alert"].show; var errorHandler = imports.error_handler; - var metrics = imports.metrics; var eio = require("engine.io"); var Consumer = require("vfs-socket/consumer").Consumer; @@ -54,7 +50,7 @@ define(function(require, exports, module) { var plugin = new Plugin("Ajax.org", main.consumes); var emit = plugin.getEmitter(); - // Give reference to vfs to plugins + // Give reference to vfs to plugin errorDialog.vfs = plugin; var buffer = []; @@ -213,7 +209,6 @@ define(function(require, exports, module) { vfsEndpoint.get(protocolVersion, function(err, urls) { if (err) { - metrics.increment("connect_failed", 1, true); if (!showErrorTimer) { showErrorTimer = setTimeout(function() { showVfsError(showErrorTimerMessage); diff --git a/plugins/c9.vfs.standalone/standalone.js b/plugins/c9.vfs.standalone/standalone.js index ff449c2f..55d2c8a4 100644 --- a/plugins/c9.vfs.standalone/standalone.js +++ b/plugins/c9.vfs.standalone/standalone.js @@ -48,7 +48,7 @@ function plugin(options, imports, register) { imports.connect.use(api); api.get("/", function(req, res, next) { - res.writeHead(302, { "Location": options.sdk ? "/ide.html" : "/static/places.html" }); + res.writeHead(302, { "Location": "/ide.html" }); res.end(); }); diff --git a/plugins/c9.vfs.standalone/www/test.js b/plugins/c9.vfs.standalone/www/test.js index 414b1b37..a4ac2afb 100644 --- a/plugins/c9.vfs.standalone/www/test.js +++ b/plugins/c9.vfs.standalone/www/test.js @@ -407,10 +407,6 @@ require([ } }, - "metrics": { - getLastPing: function() { throw Error("Not implemented"); }, - getLastest: function() { throw Error("Not implemented"); }, - }, error_handler: {reportError: function(){}}, installer: { show: function(){} diff --git a/settings/standalone.js b/settings/standalone.js index d7cf1d34..92a162c9 100644 --- a/settings/standalone.js +++ b/settings/standalone.js @@ -11,7 +11,6 @@ module.exports = function(manifest, installPath) { var builders = require("../plugins/c9.ide.run.build/builders_list"); var workspaceDir = path.resolve(__dirname + "/../"); - var sdk = !manifest.sdk; if (process.platform == "win32" && process.env.HOME === undefined) { process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH; @@ -38,7 +37,6 @@ module.exports = function(manifest, installPath) { home: home, uid: "-1", dev: true, - sdk: sdk, pid: process.pid, port: process.env.PORT || 8181, host: process.env.IP || "0.0.0.0",