Changeset d21198f for server

Timestamp:

Jan 11, 2012, 3:27:02 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

34a4e5d

Parents:

eee389a

git-author:

Jessica B. Hamrick <jhamrick@…> (01/11/12 15:27:02)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/11/12 15:27:02)

Message:

Fix some threading deadlock bugs

Location:

server/lib/gutenbach/server

Files:

• __init__.py (modified) (1 diff)
• job.py (modified) (1 diff)
• printer.py (modified) (2 diffs)

server/lib/gutenbach/server/__init__.py

@@ -23 +23 @@
 
 # configure and initialize logging
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)
 

server/lib/gutenbach/server/job.py

@@ -138 +138 @@
         self.state = States.PROCESSING
         self.player.callback = self._completed
-        self.player.run()
+        self.player.start()
 
     def pause(self):

server/lib/gutenbach/server/printer.py

@@ -50 +50 @@
         
     def __init__(self, name, *args, **kwargs):
+
+        super(GutenbachPrinter, self).__init__(*args, **kwargs)
+        
+        self.name = name
+        self.time_created = int(time.time())
+
+        self.finished_jobs = []
+        self.pending_jobs = []
+        self.current_job = None
+        self.jobs = {}
+
         self.lock = threading.RLock()
-
-        with self.lock:
-            super(GutenbachPrinter, self).__init__(*args, **kwargs)
-            
-            self.name = name
-            self.time_created = int(time.time())
-
-            self.finished_jobs = []
-            self.pending_jobs = []
-            self.current_job = None
-            self.jobs = {}
-
-            self.running = False
-            self.paused = False
-
-            # CUPS ignores jobs with id 0, so we have to start at 1
-            self._next_job_id = 1
+        self.running = False
+        self.paused = False
+
+        # CUPS ignores jobs with id 0, so we have to start at 1
+        self._next_job_id = 1
 
     def __repr__(self):
@@ -132 +131 @@
                     job_id = heapq.heappop(self.pending_jobs)
                     self.current_job = self.get_job(job_id)
+                    print "before play"
                     self.current_job.play()
+                    print "after play"
                 except IndexError:
-                    pass
+                    self.current_job = None
                 except InvalidJobStateException:
                     heapq.heappush(self.pending_jobs, self.current_job.id)
-                finally:
                     self.current_job = None