From fdc562bbed8cf6483b45184f7b139b1799900cba Mon Sep 17 00:00:00 2001
From: itsikkes <itsikkes@users.noreply.github.com>
Date: Mon, 6 Jun 2016 11:50:33 +0300
Subject: [PATCH] improve db sync and task log bugfix

---
 .../cc/admin/ui/js/monkeysb-admin.js            |  2 +-
 monkey_business/cc/connectors/__init__.py       |  2 ++
 monkey_business/cc/main.py                      | 17 +++++++++--------
 monkey_business/cc/tasks_manager.py             | 17 +++++++++++++----
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/monkey_business/cc/admin/ui/js/monkeysb-admin.js b/monkey_business/cc/admin/ui/js/monkeysb-admin.js
index abe33ad34..247381a0a 100644
--- a/monkey_business/cc/admin/ui/js/monkeysb-admin.js
+++ b/monkey_business/cc/admin/ui/js/monkeysb-admin.js
@@ -71,7 +71,7 @@ function updateJobs() {
         var jobsList = json.objects;
 
         for (var i = 0; i < jobsList.length; i++) {
-            jobsTable.row.add([jobsList[i].id, jobsList[i].creation_time, jobsList[i].type,jobsList[i].execution.state, JSON.stringify(jobsList[i].properties)]);
+            jobsTable.row.add([jobsList[i].id, jobsList[i].creation_time, jobsList[i].type,jobsList[i].state, JSON.stringify(jobsList[i].properties)]);
         }
 
         jobsTable.draw();
diff --git a/monkey_business/cc/connectors/__init__.py b/monkey_business/cc/connectors/__init__.py
index b282d014a..113de9db4 100644
--- a/monkey_business/cc/connectors/__init__.py
+++ b/monkey_business/cc/connectors/__init__.py
@@ -42,8 +42,10 @@ class NetControllerConnector(object):
     def set_logger(self, logger):
         self.log = logger
 
+
 class NetControllerJob(object):
     connector_type = NetControllerConnector
+
     _connector = None
     _logger = None
 
diff --git a/monkey_business/cc/main.py b/monkey_business/cc/main.py
index 7cf89d670..8a1d37fcb 100644
--- a/monkey_business/cc/main.py
+++ b/monkey_business/cc/main.py
@@ -143,9 +143,12 @@ class JobCreation(restful.Resource):
                 job.load_job_properties(loaded_job.get("properties"))
 
         if action == "delete":
-            if loaded_job.get("execution")["state"] == "pending":
-                mongo.db.job.remove({"_id": bson.ObjectId(jobid)})
-                return {'status': 'ok'}
+            if loaded_job.get("state") == "pending":
+                res = mongo.db.job.remove({"_id": bson.ObjectId(jobid), "state": "pending"})
+                if res["nModified"] == 1:
+                    return {'status': 'ok'}
+                else:
+                    return {'status': 'error deleting'}
             else:
                 return {'status': 'bad state'}
 
@@ -202,19 +205,17 @@ class JobCreation(restful.Resource):
                 return {'status': 'failed'}
 
         else:
-            execution_state = {"taskid": "",
-                               "state" : "pending"}
             new_job = {
                 "creation_time": datetime.now(),
                 "type": jobtype,
                 "properties": parsed_prop,
-                "execution": execution_state,
+                "taskid": "",
+                "state" : "pending",
             }
             jobid = mongo.db.job.insert(new_job)
             async = tasks_manager.run_task.delay(jobid)
-            execution_state["taskid"] = async.id
             mongo.db.job.update({"_id": jobid},
-                                {"$set": {"execution": execution_state}})
+                                {"$set": {"taskid": async.id}})
 
             return {'status': 'created'}
 
diff --git a/monkey_business/cc/tasks_manager.py b/monkey_business/cc/tasks_manager.py
index 0b57b8bbc..03a82e537 100644
--- a/monkey_business/cc/tasks_manager.py
+++ b/monkey_business/cc/tasks_manager.py
@@ -33,13 +33,17 @@ class JobExecution(object):
     def __init__(self, mongo, jobinfo):
         self._mongo = mongo
         self._jobinfo = jobinfo
-        self.update_job_state("processing")
 
         job_class = get_jobclass_by_name(self._jobinfo["type"])
         con = job_class.connector_type()
         refresh_connector_config(self._mongo, con)
         self._job = job_class(con, self)
         self._job.load_job_properties(self._jobinfo["properties"])
+        prev_log = self._mongo.db.results.find_one({"jobid": self._jobinfo["_id"]})
+        if prev_log:
+            self._log = prev_log["log"]
+        else:
+            self._log = []
 
     def get_job(self):
         return self._job
@@ -48,9 +52,8 @@ class JobExecution(object):
         self._jobinfo = self._mongo.db.job.find_one({"_id": self._jobinfo["_id"]})
 
     def update_job_state(self, state):
-        self._jobinfo["execution"]["state"] = state
         self._mongo.db.job.update({"_id": self._jobinfo["_id"]},
-                                  {"$set": {"execution": self._jobinfo["execution"]}})
+                                  {"$set": {"state": state}})
 
     def _log_resutls(self, res):
         self._mongo.db.results.update({"jobid": self._jobinfo["_id"]},
@@ -65,13 +68,15 @@ class JobExecution(object):
 
     def run(self):
         self.log("Starting job")
-        res = False
+
+        res = None
         try:
             res = self._job.run()
         except Exception, e:
             self.log("Exception raised while running: %s" % e)
             self.update_job_state("error")
             return False
+
         if res:
             self.log("Done job startup")
             self.update_job_state("running")
@@ -95,6 +100,10 @@ class JobExecution(object):
 @celery.task
 def run_task(jobid):
     print "searching for ", jobid
+    aquire_task = mongo.db.job.update({"_id": jobid, "state": "pending"}, {"$set": {"state": "processing"}})
+    if aquire_task["nModified"] != 1:
+        return False
+
     job_info = mongo.db.job.find_one({"_id": jobid})
     if not job_info:
         return False