summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter 'Pita' Martischka <petermartischka@googlemail.com>2011-11-14 21:35:37 -0800
committerPeter 'Pita' Martischka <petermartischka@googlemail.com>2011-11-14 21:35:37 -0800
commit6d190f517e8c5a131ec1e805513e4bd6492e65bf (patch)
tree33016b99450f98938013916e562f058fd1bc278e
parent9eac04aaa61d6199ae5833c676447b4eef0c459e (diff)
parent73711abd97aced9bc6c12d1e013d29d5e4315672 (diff)
downloadetherpad-lite-6d190f517e8c5a131ec1e805513e4bd6492e65bf.zip
Merge pull request #184 from thomasf/issue158
Kind of a hack but fixes issue #158
-rw-r--r--node/server.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/node/server.js b/node/server.js
index 2bebe6a2..57609ac8 100644
--- a/node/server.js
+++ b/node/server.js
@@ -91,7 +91,10 @@ async.waterfall([
var httpLogger = log4js.getLogger("http");
app.configure(function()
{
- app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'}));
+ // If the log level specified in the config file is WARN or ERROR the application server never starts listening to requests as reported in issue #158.
+ // Not installing the log4js connect logger when the log level has a higher severity than INFO since it would not log at that level anyway.
+ if (!(settings.loglevel === "WARN" || settings.loglevel == "ERROR"))
+ app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'}));
app.use(express.cookieParser());
});