diff options
| author | Marcel Klehr <mklehr@gmx.net> | 2012-10-03 10:09:00 +0200 |
|---|---|---|
| committer | Marcel Klehr <mklehr@gmx.net> | 2012-10-03 10:09:00 +0200 |
| commit | 2684a1d2950b1803edd877fabd62bfaaf516819a (patch) | |
| tree | 0c655703c615de548a6ee8601a2fbe9ada5e9e79 /src/node/hooks/express | |
| parent | d91b1ecd2465d140aed5452c7e4eb332e410a0c6 (diff) | |
| parent | 2cf46d3964978960bed62d159fe7eb47933592c9 (diff) | |
| download | etherpad-lite-2684a1d2950b1803edd877fabd62bfaaf516819a.zip | |
Merge branch 'develop' into express-v3
Conflicts:
src/node/hooks/express/errorhandling.js
Diffstat (limited to 'src/node/hooks/express')
| -rw-r--r-- | src/node/hooks/express/errorhandling.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/node/hooks/express/errorhandling.js b/src/node/hooks/express/errorhandling.js index 749b0427..3c595683 100644 --- a/src/node/hooks/express/errorhandling.js +++ b/src/node/hooks/express/errorhandling.js @@ -39,11 +39,8 @@ exports.expressCreateServer = function (hook_name, args, cb) { // allowing you to respond however you like res.send(500, { error: 'Sorry, something bad happened!' }); console.error(err.stack? err.stack : err.toString()); - exports.gracefulShutdown(); - next(); }) - //connect graceful shutdown with sigint and uncaughtexception if(os.type().indexOf("Windows") == -1) { //sigint is so far not working on windows |