diff --git a/package.json b/package.json index 769b82a0eb..b36648d917 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,6 @@ "js2xmlparser": "~1.0.0", "lodash": "^3.10.1", "lodash.setwith": "^4.2.0", - "loggly": "~1.0.8", "markdown-it": "^6.0.1", "merge-stream": "^1.0.0", "method-override": "^2.3.5", diff --git a/website/server/libs/api-v2/logging.js b/website/server/libs/api-v2/logging.js index 9737159f43..454b5a5aa8 100644 --- a/website/server/libs/api-v2/logging.js +++ b/website/server/libs/api-v2/logging.js @@ -1,24 +1,7 @@ var nconf = require('nconf'); var winston = require('winston'); -var logger, loggly; - -// Currently disabled -if (nconf.get('LOGGLY:enabled')){ - loggly = require('loggly').createClient({ - token: nconf.get('LOGGLY:token'), - subdomain: nconf.get('LOGGLY:subdomain'), - auth: { - username: nconf.get('LOGGLY:username'), - password: nconf.get('LOGGLY:password') - }, - // - // Optional: Tag to send with EVERY log message - // - tags: [('heroku-'+nconf.get('BASE_URL'))], - json: true - }); -} +var logger; if (!logger) { logger = new (winston.Logger)({}); @@ -49,9 +32,4 @@ module.exports.warn = function(/* variable args */) { module.exports.error = function(/* variable args */) { if (logger) logger.error.apply(logger, arguments); -}; - -module.exports.loggly = function(/* variable args */){ - if (loggly) - loggly.log.apply(loggly, arguments); -}; +}; \ No newline at end of file diff --git a/website/server/middlewares/api-v2/errorHandler.js b/website/server/middlewares/api-v2/errorHandler.js index e62753f5f9..fcea9d175c 100644 --- a/website/server/middlewares/api-v2/errorHandler.js +++ b/website/server/middlewares/api-v2/errorHandler.js @@ -11,13 +11,6 @@ module.exports = function(err, req, res, next) { "\n\nbody: " + JSON.stringify(req.body) + (res.locals.ops ? "\n\ncompleted ops: " + JSON.stringify(res.locals.ops) : ""); logging.error(stack); - /*logging.loggly({ - error: "Uncaught error", - stack: (err.stack || err.message || err), - body: req.body, headers: req.header, - auth: req.headers['x-api-user'], - originalUrl: req.originalUrl - });*/ var message = err.message ? err.message : err; message = (message.length < 200) ? message : message.substring(0,100) + message.substring(message.length-100,message.length); res.status(500).json({err:message}); //res.end(err.message);