more logging on shut execution shut down and server startup

MeYoung · Mar 30, 2014 · ee6315c · ee6315c
1 parent 8e07a15
commit ee6315c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/app.js b/app.js
@@ -237,12 +237,14 @@ common.initLogger("server");
 common.parseConfig(function(){
     common.initDB(common.Config.DBPort,function(){
         common.cleanUpExecutions();
+        common.cleanUpUserStatus(function(){
+            var server = require('http').createServer(app);
+            server.listen(common.Config.AppServerPort, function(){
+              realtime.initSocket(server);
+               common.logger.log("Express server listening on port %d in %s mode", common.Config.AppServerPort, app.settings.env);
+            });
+        });
         auth.loadSessions();
     });
 
-    var server = require('http').createServer(app);
-    server.listen(common.Config.AppServerPort, function(){
-        realtime.initSocket(server);
-      console.log("Express server listening on port %d in %s mode", common.Config.AppServerPort, app.settings.env);
-    });
 });
diff --git a/routes/executionengine.js b/routes/executionengine.js
@@ -24,7 +24,7 @@ exports.stopexecutionPost = function(req, res){
         updateExecutionTestCase({_id:execution.testcases[testcase]._id},{$set:{status:"Not Run","result":"",resultID:null,error:"",trace:"",startdate:"",enddate:"",runtime:""}});
     }
     git.deleteFiles(path.join(__dirname, '../public/automationscripts/'+req.cookies.project+"/"+req.cookies.username+"/build"),"jar_"+req.body.executionID);
-
+    common.logger.log("Stop button was pushed");
     cleanExecutionMachines(req.body.executionID,function(){
         updateExecution({_id:req.body.executionID},{$set:{status:"Ready To Run"}},true,function(){
             executionsRoute.updateExecutionTotals(req.body.executionID);