added some tests and logging

Author: Matt George

pyres/__init__.py

@@ -148,7 +148,8 @@ def enqueue(self, klass, *args):
     def enqueue_from_string(self, klass_as_string, queue, *args):
         self.push(queue, {'class':klass_as_string,'args':args})
         logging.info("enqueued '%s' job" % klass_as_string)
-        logging.debug("job arguments: %s" % args)
+        if args:
+            logging.debug("job arguments: %s" % args)
 
     def queues(self):
         return self.redis.smembers("resque:queues") or []
@@ -203,6 +204,9 @@ def close(self):
 
     def enqueue_at(self, datetime, klass, *args):
         class_name = '%s.%s' % (klass.__module__, klass.__name__)
+        logging.info("enqueued '%s' job for execution at %s" % (class_name, datetime))
+        if args:
+            logging.debug("job arguments are: %s" % args)
         self.delayed_push(datetime, {'class':class_name,'queue': klass.queue, 'args':args})
 
     def delayed_push(self, datetime, item):

pyres/scheduler.py

@@ -1,11 +1,16 @@
 import signal
 import time
+import logging
 
 from pyres import ResQ
 
 class Scheduler(object):
 
     def __init__(self, server="localhost:6379", password=None):
+        """
+        >>> from pyres.scheduler import Scheduler
+        >>> scheduler = Scheduler('localhost:6379')
+        """
         self._shutdown = False
         if isinstance(server,basestring):
             self.resq = ResQ(server=server, password=password)
@@ -15,27 +20,27 @@ def __init__(self, server="localhost:6379", password=None):
             raise Exception("Bad server argument")
 
     def register_signal_handlers(self):
-        print 'registering signals'
+        logging.info('registering signals')
         signal.signal(signal.SIGTERM, self.schedule_shutdown)
         signal.signal(signal.SIGINT, self.schedule_shutdown)
         signal.signal(signal.SIGQUIT, self.schedule_shutdown)
 
     def schedule_shutdown(self, signal, frame):
-        print 'shutting down started'
+        logging.info('shutting down started')
         self._shutdown = True
 
     def __call__(self):
-        print 'starting up'
+        logging.info('starting up')
         self.register_signal_handlers()
         #self.load_schedule()
-        print 'looking for delayed items'
+        logging.info('looking for delayed items')
         while True:
             if self._shutdown is True:
                 break
             self.handle_delayed_items()
-            print 'sleeping'
+            logging.info('sleeping')
             time.sleep(5)
-        print 'shutting down complete'
+        logging.info('shutting down complete')
 
     def next_timestamp(self):
         while True:
@@ -56,9 +61,9 @@ def next_item(self, timestamp):
 
     def handle_delayed_items(self):
         for timestamp in self.next_timestamp():
-            print 'handling timestamp: %s' % timestamp
+            logging.info('handling timestamp: %s' % timestamp)
             for item in self.next_item(timestamp):
-                print 'queueing item %s' % item
+                logging.debug('queueing item %s' % item)
                 klass = item['class']
                 queue = item['queue']
                 args = item['args']

scripts/pyres_scheduler

@@ -1,14 +1,19 @@
 #!/usr/bin/env python
 from pyres.scheduler import Scheduler
+import logging
+
 def main():
     from optparse import OptionParser
     usage = "usage: %prog [options] arg1"
     parser = OptionParser(usage=usage)
     #parser.add_option("-q", dest="queue_list")
     parser.add_option("--host", dest="host", default="localhost")
     parser.add_option("--port",dest="port",type="int", default=6379)
+    parser.add_option('-l', '--log-level', dest='log_level', default='info', help='log level.  Valid values are "debug", "info", "warning", "error", "critical", in decreasing order of verbosity. Defaults to "info" if parameter not specified.')
     (options,args) = parser.parse_args()
-    server = '%s:%s' % (options.host,options.port)
+    log_level = getattr(logging, options.log_level.upper(),'INFO')
+    logging.basicConfig(level=log_level, format="%(module)s: %(asctime)s: %(levelname)s: %(message)s")
+    server = '%s:%s' % (options.host, options.port)
     Scheduler.run(server)
 
 if __name__ == "__main__":

tests/test_schedule.py

@@ -59,4 +59,16 @@ def test_next_item_for_timestamp(self):
         item = self.resq.next_item_for_timestamp(timestamp)
         assert isinstance(item, dict)
         assert self.redis.zcard('resque:delayed_queue_schedule') == 1
+    
+    def test_scheduler_init(self):
+        scheduler = Scheduler(self.resq)
+        assert not scheduler._shutdown
+        scheduler = Scheduler('localhost:6379')
+        assert not scheduler._shutdown
+        self.assertRaises(Exception, Scheduler, Basic)
+    
+    def test_schedule_shutdown(self):
+        scheduler = Scheduler(self.resq)
+        scheduler.schedule_shutdown(19,'')
+        assert scheduler._shutdown