Fixes, made permissions work at basic level

coderedhead · Apr 9, 2012 · cd81665 · cd81665
1 parent 5847458
commit cd81665
Show file tree

Hide file tree

Showing 39 changed files with 1,447 additions and 1,136 deletions.
diff --git a/app.js b/app.js
@@ -48,7 +48,7 @@ function bootApplication(next) {
   app.isCluster = false;
 
   // Load configuration
-  var Config = require(path + "/lib/Config").Config;
+  var Config = calipso.config; //require(path + "/lib/core/Config").Config;
   app.config = new Config();
   app.config.init();
 

diff --git a/cluster.js b/cluster.js
@@ -37,7 +37,7 @@ function launchServer() {
 
 
       // Load configuration
-      var Config = require(rootpath + "lib/Config").Config,
+      var Config = require(rootpath + "lib/core/Config"),
           config = new Config();  
       config.init();
 
@@ -48,6 +48,7 @@ function launchServer() {
       totalWorkers = config.get('server:cluster:workers') || argv.c;
 
       // Fork workers based on num cpus
+      console.log("Loading ".green + totalWorkers + " workers, please wait ...".green);
       for (var i = 0; i < totalWorkers; i++) {
         forkWorker();
       }