diff options
author | mluto <m@luto.at> | 2013-01-15 07:31:51 +0100 |
---|---|---|
committer | mluto <m@luto.at> | 2013-01-15 07:31:51 +0100 |
commit | 7db6448e2acb68bec8f70afd5f1389e60ac90858 (patch) | |
tree | 11d66c1233b85dbb8fa27eb7e63c30e535ae07ae /bin | |
parent | 5eb09f981ba0e7a9062f4d3b28d62efc3ae26f6c (diff) | |
download | etherpad-lite-7db6448e2acb68bec8f70afd5f1389e60ac90858.zip |
Load npm before everything else in checkPad.js
Diffstat (limited to 'bin')
-rw-r--r-- | bin/checkPad.js | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/bin/checkPad.js b/bin/checkPad.js index a92f836c..bad5abce 100644 --- a/bin/checkPad.js +++ b/bin/checkPad.js @@ -10,15 +10,25 @@ if(process.argv.length != 3) //get the padID var padId = process.argv[2]; -//initalize the database -var settings = require("../src/node/utils/Settings"); +//initalize the variables +var db, settings, padManager; +var npm = require("../src/node_modules/npm"); var async = require("../src/node_modules/async"); -var db = require('../src/node/db/DB'); var Changeset = require("ep_etherpad-lite/static/js/Changeset"); -var padManager; async.series([ + //load npm + function(callback) { + npm.load({}, function(er) { + callback(er); + }) + }, + //load modules + function(callback) { + settings = require('../src/node/utils/Settings'); + db = require('../src/node/db/DB'); + }, //intallize the database function (callback) { |