Changeset bd5bffc


Ignore:
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

Location:
server
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • server/lib/gutenbach/server/job.py

    rab7c1dd rbd5bffc  
    5656    def __del__(self):
    5757        if self.player:
    58             self.player.mplayer_stop()
     58            if self.player.is_playing:
     59                self.player.mplayer_stop()
    5960            if self.player.fh:
    6061                if self.player.fh.closed:
  • server/lib/gutenbach/server/player.py

    rcf0d7e8 rbd5bffc  
    2828    def is_playing(self):
    2929        if self._dryrun:
    30             return self.isAlive() and not self.is_done
     30            return self.ident is not None and \
     31                   self.isAlive() and \
     32                   not self.is_done
    3133        else:
    32             return self.isAlive() and \
    33                       not self.is_done and \
    34                       self.player is not None and \
    35                       self.player.poll() is None
    36 
     34            return self.ident is not None and \
     35                   self.isAlive() and \
     36                   not self.is_done and \
     37                   self.player is not None and \
     38                   self.player.poll() is None
     39       
    3740    @property
    3841    @sync
     
    121124                logger.warning("trying to pause non-playing job")
    122125        time.sleep(self._lag)
    123                
     126
    124127    def mplayer_stop(self):
    125         # Note: Inner Lock due to join.
     128        # Note: Inner lock due to join.
    126129        with self.lock:
    127130            if self.is_playing:
     
    134137                logger.warning("trying to stop non-playing job")
    135138        self.join()
     139
  • server/test/server/job.py

    radf8cf0 rbd5bffc  
    66import sys
    77import time
     8import logging
    89
    910def make_tempfile():
     
    204205
    205206if __name__ == "__main__":
     207    logging.basicConfig(loglevel=logging.CRITICAL)
    206208    unittest.main()
Note: See TracChangeset for help on using the changeset viewer.