stupid logger fixes for tests ARGH

aflatter · Jan 13, 2012 · 7ba2328 · 7ba2328
1 parent 71c6f81
commit 7ba2328
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Common/node/levents.js b/Common/node/levents.js
@@ -9,8 +9,8 @@
 
 var request = require("request");
 var url = require("url");
-require.paths.push(__dirname);
 var lconfig = require("lconfig");
+lconfig.load(__dirname + '/../../Config/config.json');
 var serviceManager = require("lservicemanager");
 var logger = require("./logger.js");
 var syncManager = require('lsyncmanager');

diff --git a/Common/node/lscheduler.js b/Common/node/lscheduler.js
@@ -67,7 +67,7 @@ exports.Scheduler.prototype.scheduleURL = function(atTime, serviceID, callbackUR
         });
     }
     setTimeout(function() {
-        if (!serviceManager.isInstalled(serviceID)) {
+        if (!serviceManager.map(serviceID)) {
             self.scheduledActions.splice(self.scheduledActions.indexOf(trackingInfo));
             self.savePending();
         } else {

diff --git a/Common/node/lservicemanager.js b/Common/node/lservicemanager.js
@@ -16,20 +16,21 @@ var spawn = require('child_process').spawn;
 var levents = require('levents');
 var wrench = require('wrench');
 var lutil = require(__dirname + "/lutil");
-var logger = require('logger');
+var logger;
 var async = require('async');
 
 var serviceMap = { }; // All of the immediately addressable services in the system
 
 var shuttingDown = null;
 var syncletManager, registry;
 var lockerPortNext = parseInt("1" + lconfig.lockerPort, 10);
-logger.info('lservicemanager lockerPortNext = ' + lockerPortNext);
 
 /**
 * Scans the Me directory for instaled services
 */
 exports.init = function (sman, reg, callback) {
+    logger = require('logger');
+    logger.info('lservicemanager lockerPortNext = ' + lockerPortNext);
     syncletManager = sman;
     registry = reg;
     var dirs = fs.readdirSync(lconfig.me);