Changeset d42236e for server/lib/gutenbach/server/printer.py

Timestamp:

Jan 21, 2012, 11:14:07 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

75928fe

Parents:

3cb6c7b

git-author:

Jessica B. Hamrick <jhamrick@…> (01/21/12 23:12:03)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/21/12 23:14:07)

Message:

Fix a few more bugs in printer.py and update test cases for printer.py

File:

• server/lib/gutenbach/server/printer.py (modified) (8 diffs)

server/lib/gutenbach/server/printer.py

@@ -6 +6 @@
 import time
 import threading
-import heapq
 import traceback
 import sys
@@ -102 +101 @@
         self._running = True
         while self._running:
-            try:
-                with self.lock:
+            with self.lock:
+                try:
                     if self.current_job is None:
                         self.start_job()
                     elif self.current_job.is_done:
                         self.complete_job()
-            except:
-                logger.fatal(traceback.format_exc())
-                sys.exit(1)
+                except:
+                    self._running = False
+                    logger.fatal(traceback.format_exc())
+                    break
             time.sleep(0.1)
 
     def stop(self):
         with self.lock:
+            for job in self.jobs.keys():
+                try:
+                    self.jobs[job].abort()
+                    del self.jobs[job]
+                except InvalidJobStateException:
+                    pass
+                
             self._running = False
         if self.ident is not None and self.isAlive():
@@ -159 +166 @@
     @sync
     def state(self):
-        if self.is_running and self.current_job is not None:
-            state = States.PROCESSING
-        elif self.is_running and len(self.pending_jobs) == 0:
-            state = States.IDLE
+        if self.is_running and not self.paused:
+            if len(self.active_jobs) > 0:
+                state = States.PROCESSING
+            else:
+                state = States.IDLE
         else:
             state = States.STOPPED
+
         return state
 
@@ -194 +203 @@
         if not self.paused and self.current_job is None:
             try:
-                job_id = heapq.heappop(self.pending_jobs)
+                job_id = self.pending_jobs.pop(0)
                 self.current_job = self.get_job(job_id)
                 self.current_job.play()
             except IndexError:
-                self.current_job = None
-            except InvalidJobStateException:
-                heapq.heappush(self.pending_jobs, self.current_job.id)
                 self.current_job = None
                     
@@ -530 +536 @@
 
     @sync
-    def create_job(self, requesting_user_name=None, job_name=None,
-                   job_k_octets=None):
+    def create_job(self, requesting_user_name=None,
+                   job_name=None, job_k_octets=None):
 
         self.assert_running()
@@ -544 +550 @@
 
         self.jobs[job_id] = job
-        self.pending_jobs.append(job_id)
-        
         return job_id
 
@@ -617 +621 @@
         job = self.get_job(job_id)
         job.spool(document)
-
+        if 'dryrun' in self.config and self.config['dryrun']:
+            job.player._dryrun = True
+        self.pending_jobs.append(job_id)
+        
     @sync
     def send_uri(self, job_id, document_uri, document_name=None,
@@ -628 +635 @@
         # XXX: need to validate URI
         # XXX: need to deal with the URI stream?
+
         #job.spool_uri(document_uri)
-
+        #if 'dryrun' in self.config and self.config['dryrun']:
+        #    job.player._dryrun = True
+        #self.pending_jobs.append(job_id)
+        
     @sync
     def get_job_attributes(self, job_id, requested_attributes=None):