Last active
August 29, 2015 14:07
-
-
Save lefnire/7c02f81d49bbe036f601 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/package.json b/package.json | |
index a173cdf..6cb111f 100644 | |
--- a/package.json | |
+++ b/package.json | |
@@ -54,7 +54,8 @@ | |
"validator": "~3.11.2", | |
"winston": "~0.7.2", | |
"winston-mail": "~0.2.7", | |
- "winston-newrelic": "~0.1.4" | |
+ "winston-newrelic": "~0.1.4", | |
+ "webkit-devtools-agent": "git://github.com/c4milo/node-webkit-agent.git#master" | |
}, | |
"private": true, | |
"subdomain": "habitrpg", | |
commit ea3a93e86b6dac7316d208099f3fa1df9e3bf39e | |
Author: Tyler Renelle <[email protected]> | |
Date: Wed Oct 1 15:43:50 2014 -0600 | |
tmp(memleak) | |
diff --git a/src/controllers/user.js b/src/controllers/user.js | |
index 1d5ae11..422d1cc 100644 | |
--- a/src/controllers/user.js | |
+++ b/src/controllers/user.js | |
@@ -444,14 +444,17 @@ api.batchUpdate = function(req, res, next) { | |
}); | |
// call all the operations, then return the user object to the requester | |
- async.waterfall(ops, function(err,user) { | |
+ async.waterfall(ops, function(err,_user) { | |
res.json = oldJson; | |
res.send = oldSend; | |
if (err) return next(err); | |
- var response = user.toJSON(); | |
+ var response = _user.toJSON(); | |
response.wasModified = res.locals.wasModified; | |
+ user.fns.nullify(); | |
+ user = res.locals.user = oldSend = oldJson = oldSave = null; | |
+ | |
// return only drops & streaks | |
if (response._tmp && response._tmp.drop){ | |
res.json(200, {_tmp: {drop: response._tmp.drop}, _v: response._v}); | |
diff --git a/src/server.js b/src/server.js | |
index c494641..97fb737 100644 | |
--- a/src/server.js | |
+++ b/src/server.js | |
@@ -1,4 +1,8 @@ | |
// Only do the minimal amount of work before forking just in case of a dyno restart | |
+ | |
+var agent = require('webkit-devtools-agent'); | |
+agent.start() | |
+ | |
var cluster = require("cluster"); | |
var _ = require('lodash'); | |
var nconf = require('nconf'); | |
@@ -8,7 +12,7 @@ var logging = require('./logging'); | |
var isProd = nconf.get('NODE_ENV') === 'production'; | |
var isDev = nconf.get('NODE_ENV') === 'development'; | |
-if (cluster.isMaster && (isDev || isProd)) { | |
+if (false && cluster.isMaster && (isDev || isProd)) { | |
// Fork workers. | |
_.times(_.min([require('os').cpus().length,2]), function(){ | |
cluster.fork(); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment