Changeset bd5bffc for server/lib/gutenbach/server/player.py

Timestamp:

Jan 21, 2012, 6:22:51 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

441604f

Parents:

ab7c1dd

git-author:

Jessica B. Hamrick <jhamrick@…> (01/21/12 18:22:51)

git-committer:

Jessica B. Hamrick <jhamrick@…> (01/21/12 18:22:51)

Message:

Fix logger issues in job and player

File:

• server/lib/gutenbach/server/player.py (modified) (3 diffs)

server/lib/gutenbach/server/player.py

@@ -28 +28 @@
     def is_playing(self):
         if self._dryrun:
-            return self.isAlive() and not self.is_done
+            return self.ident is not None and \
+                   self.isAlive() and \
+                   not self.is_done
         else:
-            return self.isAlive() and \
-                      not self.is_done and \
-                      self.player is not None and \
-                      self.player.poll() is None
-
+            return self.ident is not None and \
+                   self.isAlive() and \
+                   not self.is_done and \
+                   self.player is not None and \
+                   self.player.poll() is None
+        
     @property
     @sync
@@ -121 +124 @@
                 logger.warning("trying to pause non-playing job")
         time.sleep(self._lag)
-                
+
     def mplayer_stop(self):
-        # Note: Inner Lock due to join.
+        # Note: Inner lock due to join.
         with self.lock:
             if self.is_playing:
@@ -134 +137 @@
                 logger.warning("trying to stop non-playing job")
         self.join()
+