From cbca250b997d35973ecd01724d88e4b1aae63697 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Tue, 3 Nov 2015 18:10:42 +0100
Subject: [PATCH] remove winston-mail and winston-newrelic from deps as they
 may not be compatible with v2

---
 package.json                | 4 +---
 website/src/libs/logging.js | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7b08df56df..4bdb699e78 100644
--- a/package.json
+++ b/package.json
@@ -83,9 +83,7 @@
     "swagger-node-express": "lefnire/swagger-node-express#habitrpg",
     "universal-analytics": "~0.3.2",
     "validator": "~3.19.0",
-    "winston": "~2.0.1",
-    "winston-mail": "~0.2.9",
-    "winston-newrelic": "~0.1.4"
+    "winston": "~2.0.1"
   },
   "private": true,
   "engines": {
diff --git a/website/src/libs/logging.js b/website/src/libs/logging.js
index 25870b4ecd..c381873395 100644
--- a/website/src/libs/logging.js
+++ b/website/src/libs/logging.js
@@ -1,6 +1,6 @@
 var nconf = require('nconf');
 var winston = require('winston');
-require('winston-mail').Mail;
+//require('winston-mail').Mail;
 //require('winston-newrelic');
 
 var logger, loggly;
@@ -26,7 +26,7 @@ if (logger == null) {
     logger = new (winston.Logger)({});
     if (nconf.get('NODE_ENV') == 'production') {
         //logger.add(winston.transports.newrelic, {});
-        if (!nconf.get('DISABLE_ERROR_EMAILS')) {
+        if (!nconf.get('DISABLE_ERROR_EMAILS') && false) {
           logger.add(winston.transports.Mail, {
               to: nconf.get('ADMIN_EMAIL') || nconf.get('SMTP_USER'),
               from: "HabitRPG <" + nconf.get('SMTP_USER') + ">",