Merge pull request #1 from HabitRPG/develop

update my fork

newrelic.js

@@ -0,0 +1,27 @@
+var nconf = require('nconf');
+
+/**
+ * New Relic agent configuration.
+ *
+ * See lib/config.defaults.js in the agent distribution for a more complete
+ * description of configuration variables and their potential values.
+ */
+exports.config = {
+  /**
+   * Array of application names.
+   */
+  app_name: ['Habitica'],
+  /**
+   * Your New Relic license key.
+   */
+  license_key: nconf.get('NEW_RELIC_LICENSE_KEY'),
+  ssl: false,
+  logging: {
+    /**
+     * Level at which to log. 'trace' is most useful to New Relic when diagnosing
+     * issues with the agent, 'info' and higher will impose the least overhead on
+     * production applications.
+     */
+    level: 'info'
+  }
+}

package.json

@@ -52,7 +52,7 @@
     "mongoose": "~3.8.23",
     "mongoose-id-autoinc": "~2013.7.14-4",
     "nconf": "~0.6.9",
-    "newrelic": "~1.23.0",
+    "newrelic": "~1.25.0",
     "nib": "~1.0.1",
     "nodemailer": "~0.5.2",
     "pageres": "^1.0.1",

website/src/libs/utils.js

@@ -174,8 +174,8 @@ module.exports.setupConfig = function(){
 
   if (nconf.get('NODE_ENV') === "development")
     Error.stackTraceLimit = Infinity;
-  //if (nconf.get('NODE_ENV') === 'production')
-    //require('newrelic');
+  if (nconf.get('NODE_ENV') === 'production')
+    require('newrelic');
 
   isProd = nconf.get('NODE_ENV') === 'production';
   baseUrl = nconf.get('BASE_URL');