Changes in sage/dsage/scripts/dsage_worker.py [7660:62b7be191970:7307:a7fea1f3a263]

File:

• sage/dsage/scripts/dsage_worker.py (modified) (6 diffs)

sage/dsage/scripts/dsage_worker.py

@@ -49 +49 @@
 from sage.dsage.misc.constants import DELIMITER
 from sage.dsage.misc.constants import DSAGE_DIR
-from sage.dsage.misc.constants import TMP_WORKER_FILES
 from sage.dsage.misc.misc import random_str
 
@@ -195 +194 @@
         
         cur_dir = os.getcwd() # keep a reference to the current directory
-        tmp_job_dir = os.path.join(TMP_WORKER_FILES, job.job_id)
-        if not os.path.isdir(TMP_WORKER_FILES):
-            os.mkdir(TMP_WORKER_FILES)
+        tmp_dir = os.path.join(DSAGE_DIR, 'tmp_worker_files')
+        tmp_job_dir = os.path.join(tmp_dir, job.job_id)
+        if not os.path.isdir(tmp_dir):
+            os.mkdir(tmp_dir)
         if not os.path.isdir(tmp_job_dir):
             os.mkdir(tmp_job_dir)
@@ -350 +350 @@
             msg = 'Checking job %s' % self.job.job_id
             log.msg(LOG_PREFIX % self.id + msg)
-        os.chdir(self.tmp_job_dir)
         try:
+            os.chdir(self.tmp_job_dir)
             # foo, output, new = self.sage._so_far() 
             # This sucks and is a very bad way to tell when a calculation is
@@ -499 +499 @@
         """
         
-        # 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
@@ -530 +527 @@
             if not success:
                 self.kill_sage()
+                self.start()
             else:
                 self.sage.reset()
+        self.free = True
+        self.job = None
     
     def start(self):
@@ -733 +733 @@
             return
     
+        factory = pb.PBClientFactory()        
         self.factory = PBClientFactory()
         try: