Changeset 7646:dbfab168fb1f

Timestamp:

11/07/07 22:36:08 (6 years ago)

Author:

Yi Qiang <yqiang@…>

Branch:

default

Children:

7647:511084926b5a, 8372:e822ba147ee6

Message:

Fix for #1077

Location:

sage/dsage

Files:

• scripts/dsage_worker.py (modified) (2 diffs)
• server/server.py (modified) (1 diff)

sage/dsage/scripts/dsage_worker.py

@@ -500 +500 @@
         """
         
+        # Set status to free and delete any current jobs we have
+        self.free = True
+        self.job = None
+        
         if hard_reset:
             log.msg(LOG_PREFIX % self.id + 'Performing hard reset.')
             self.kill_sage()
-            self.start()
         else: # try for a soft reset
             INTERRUPT_TRIES = 20
@@ -528 +531 @@
             if not success:
                 self.kill_sage()
-                self.start()
             else:
                 self.sage.reset()
-        self.free = True
-        self.job = None
     
     def start(self):

sage/dsage/server/server.py

@@ -286 +286 @@
                 log.msg(msg)
         
-        jdict['update_time'] = datetime.datetime.now()
+        job.update_time = datetime.datetime.now()
             
         return self.jobdb.store_job(job.reduce())