From 8223f8471477cc3bf86f164095f1097b9893d6ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Fr=C3=B6ssman?= Date: Mon, 17 Oct 2011 23:31:39 +0200 Subject: [PATCH 1/6] Kind of a hack but makes issue #158 go away. There is probably a deeper error somewhere in either log4js or express, I don't have the time to investigate that atm. --- node/server.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/node/server.js b/node/server.js index 2bebe6a24..fbaf08e5e 100644 --- a/node/server.js +++ b/node/server.js @@ -91,7 +91,8 @@ async.waterfall([ var httpLogger = log4js.getLogger("http"); app.configure(function() { - app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'})); + if (!(settings.loglevel === "WARN" || settings.loglevel == "ERROR")) + app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'})); app.use(express.cookieParser()); }); From 55e2f764d452b72f7f9541e3ee296013a693064a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Fr=C3=B6ssman?= Date: Mon, 17 Oct 2011 23:50:08 +0200 Subject: [PATCH 2/6] Updated node dependencies --- package.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index b90f789a7..4568e32f9 100644 --- a/package.json +++ b/package.json @@ -5,21 +5,21 @@ "keywords" : ["etherpad", "realtime", "collaborative", "editor"], "author" : "Peter 'Pita' Martischka ", "contributors": [ - { "name": "John McLear", + { "name": "John McLear", "name": "Hans Pinckaers", "name": "Robin Buse"} ], "dependencies" : { - "socket.io" : "0.7.9", + "socket.io" : "0.8.5", "ueberDB" : "0.1.2", - "async" : "0.1.9", - "joose" : "3.18.0", - "express" : "2.4.5", + "async" : "0.1.12", + "joose" : "3.50.0", + "express" : "2.4.7", "clean-css" : "0.2.4", - "uglify-js" : "1.0.7", + "uglify-js" : "1.1.1", "gzip" : "0.1.0", - "formidable" : "1.0.2", - "log4js" : "0.3.8" + "formidable" : "1.0.6", + "log4js" : "0.3.9" }, "version" : "1.0.0" -} +} \ No newline at end of file From cfb7dd837618859d5551dd0114b795073135c8a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Fr=C3=B6ssman?= Date: Tue, 18 Oct 2011 02:47:37 +0200 Subject: [PATCH 3/6] settings template does not reflect referneces in converter --- bin/convertSettings.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/convertSettings.json.template b/bin/convertSettings.json.template index bdd4e4999..80caa3fc5 100644 --- a/bin/convertSettings.json.template +++ b/bin/convertSettings.json.template @@ -1,5 +1,5 @@ { - "etherpad-db": + "etherpadDB": { "host": "localhost", "port": 3306, From 3152f8cfb40f2636471d13935e00e93d1a13994e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Fr=C3=B6ssman?= Date: Tue, 18 Oct 2011 10:07:56 +0200 Subject: [PATCH 4/6] I'm getting json decode errors on a pad, needed additional debug output do investigate the db --- bin/convert.js | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/bin/convert.js b/bin/convert.js index 94e9877a3..6006aa6f0 100644 --- a/bin/convert.js +++ b/bin/convert.js @@ -156,7 +156,15 @@ function convertPad(padId, callback) //parse the pages for(var i=0,length=results.length;i Date: Tue, 18 Oct 2011 10:12:08 +0200 Subject: [PATCH 5/6] Revert "Kind of a hack but makes issue #158 go away." This reverts commit 8223f8471477cc3bf86f164095f1097b9893d6ef. --- node/server.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/node/server.js b/node/server.js index fbaf08e5e..2bebe6a24 100644 --- a/node/server.js +++ b/node/server.js @@ -91,8 +91,7 @@ async.waterfall([ var httpLogger = log4js.getLogger("http"); app.configure(function() { - if (!(settings.loglevel === "WARN" || settings.loglevel == "ERROR")) - app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'})); + app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'})); app.use(express.cookieParser()); }); From 3bbb9f2ce7e8d05c27feac2c95c6094f34d6aea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Fr=C3=B6ssman?= Date: Tue, 18 Oct 2011 10:12:31 +0200 Subject: [PATCH 6/6] Revert "Updated node dependencies" This reverts commit 55e2f764d452b72f7f9541e3ee296013a693064a. --- package.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 4568e32f9..b90f789a7 100644 --- a/package.json +++ b/package.json @@ -5,21 +5,21 @@ "keywords" : ["etherpad", "realtime", "collaborative", "editor"], "author" : "Peter 'Pita' Martischka ", "contributors": [ - { "name": "John McLear", + { "name": "John McLear", "name": "Hans Pinckaers", "name": "Robin Buse"} ], "dependencies" : { - "socket.io" : "0.8.5", + "socket.io" : "0.7.9", "ueberDB" : "0.1.2", - "async" : "0.1.12", - "joose" : "3.50.0", - "express" : "2.4.7", + "async" : "0.1.9", + "joose" : "3.18.0", + "express" : "2.4.5", "clean-css" : "0.2.4", - "uglify-js" : "1.1.1", + "uglify-js" : "1.0.7", "gzip" : "0.1.0", - "formidable" : "1.0.6", - "log4js" : "0.3.9" + "formidable" : "1.0.2", + "log4js" : "0.3.8" }, "version" : "1.0.0" -} \ No newline at end of file +}