diff --git a/node/server.js b/node/server.js index 5ff11ca7e..e487d85e6 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()); }); diff --git a/static/js/pad2.js b/static/js/pad2.js index e59ba7033..977c56328 100644 --- a/static/js/pad2.js +++ b/static/js/pad2.js @@ -79,13 +79,13 @@ function randomString() function getParams() { -var params = getUrlVars() -var showControls = params["showControls"]; -var showChat = params["showChat"]; -var userName = params["userName"]; -var showLineNumbers = params["showLineNumbers"]; -var useMonospaceFont = params["useMonospaceFont"]; -var IsnoColors = params["noColors"]; + var params = getUrlVars() + var showControls = params["showControls"]; + var showChat = params["showChat"]; + var userName = params["userName"]; + var showLineNumbers = params["showLineNumbers"]; + var useMonospaceFont = params["useMonospaceFont"]; + var IsnoColors = params["noColors"]; if(IsnoColors) { @@ -131,7 +131,7 @@ var IsnoColors = params["noColors"]; if(userName) { // If the username is set as a parameter we should set a global value that we can call once we have initiated the pad. - globalUserName = unescape( userName ); + globalUserName = unescape(userName); } }