diff options
author | Marcel Klehr <mklehr@gmx.net> | 2013-01-13 12:20:49 +0100 |
---|---|---|
committer | Marcel Klehr <mklehr@gmx.net> | 2013-01-13 12:20:49 +0100 |
commit | f4b95c5ca4cd253efc81f3680c2fd166a36bdecf (patch) | |
tree | 03007edecf7e236ea409da963f5116ad770e21f7 /bin | |
parent | 2786807f2f2b1884f9d7a5d8eb499b9c2be0db7a (diff) | |
download | etherpad-lite-f4b95c5ca4cd253efc81f3680c2fd166a36bdecf.zip |
Add log4js config setting
Diffstat (limited to 'bin')
-rw-r--r-- | bin/checkPad.js | 3 | ||||
-rw-r--r-- | bin/extractPadData.js | 5 | ||||
-rw-r--r-- | bin/migrateDirtyDBtoMySQL.js | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/bin/checkPad.js b/bin/checkPad.js index a46c1814..a92f836c 100644 --- a/bin/checkPad.js +++ b/bin/checkPad.js @@ -11,8 +11,7 @@ if(process.argv.length != 3) var padId = process.argv[2]; //initalize the database -var log4js = require("../src/node_modules/log4js"); -log4js.setGlobalLogLevel("INFO"); +var settings = require("../src/node/utils/Settings"); var async = require("../src/node_modules/async"); var db = require('../src/node/db/DB'); diff --git a/bin/extractPadData.js b/bin/extractPadData.js index f79b964a..ea00f953 100644 --- a/bin/extractPadData.js +++ b/bin/extractPadData.js @@ -10,13 +10,11 @@ if(process.argv.length != 3) //get the padID var padId = process.argv[2]; -var db, dirty, padManager, pad; +var db, dirty, padManager, pad, settings; var neededDBValues = ["pad:"+padId]; var npm = require("../src/node_modules/npm"); var async = require("../src/node_modules/async"); -var log4js = require("../src/node_modules/log4js"); -log4js.setGlobalLogLevel("INFO"); async.series([ // load npm @@ -35,6 +33,7 @@ async.series([ }, // load modules function(callback) { + settings = require('../src/node/utils/Settings'); db = require('../src/node/db/DB'); dirty = require("../src/node_modules/ueberDB/node_modules/dirty")(padId + ".db"); }, diff --git a/bin/migrateDirtyDBtoMySQL.js b/bin/migrateDirtyDBtoMySQL.js index d0273de0..b4913e76 100644 --- a/bin/migrateDirtyDBtoMySQL.js +++ b/bin/migrateDirtyDBtoMySQL.js @@ -2,6 +2,7 @@ require("ep_etherpad-lite/node_modules/npm").load({}, function(er,npm) { process.chdir(npm.root+'/..') + var settings = require("ep_etherpad-lite/node/utils/Settings"); var dirty = require("ep_etherpad-lite/node_modules/ueberDB/node_modules/dirty")('var/dirty.db'); var db = require("ep_etherpad-lite/node/db/DB"); |