Merge pull request +6899 from c9/improve-metrics

Improve preview/apps proxy metrics

plugins/c9.preview/preview.handler.js

@@ -5,7 +5,8 @@ define(function(require, exports, module) {
         "connect.render",
         "connect.render.ejs",
         "connect.redirect",
-        "connect.static"
+        "connect.static",
+        "metrics"
     ];
     main.provides = ["preview.handler"];
     return main;
@@ -15,6 +16,7 @@ define(function(require, exports, module) {
         var https = require("https");
         var http = require("http");
         var mime = require("mime");
+        var metrics = imports.metrics;
         var parseUrl = require("url").parse;
         var debug = require("debug")("preview");
         
@@ -167,6 +169,7 @@ define(function(require, exports, module) {
                     else
                         serveFile(request);
                 }).on("error", function(err) {
+                    metrics.increment("preview.failed.error");
                     next(err); 
                 });
                 

plugins/c9.vfs.client/endpoint.js

@@ -97,7 +97,9 @@ define(function(require, exports, module) {
         function getVfsEndpoint(version, callback) {
             getServers(function(err, _servers) {
                 if (err) {
-                    errorHandler.reportError(err);
+                    if (err.code !== "EDISCONNECT")
+                        errorHandler.reportError(new Error("Could not get list of VFS servers"), { cause: err });
+                    metrics.increment("vfs.failed.connect_getservers", 1, true);
                     initDefaultServers();
                     _servers = servers;
                 }