Use more recent entry point system for generating console scripts.

Author: chawco

pyres/scripts.py

@@ -0,0 +1,112 @@
+#########################################################################
+#
+# Copyright (c) 2010 Polar Mobile Group Inc. All Rights Reserved.
+#
+# This software is confidential and proprietary intellectual property
+# of Polar Mobile Group Inc. ("Confidential Information"). You shall not
+# disclose such Confidential Information and shall use it only in
+# accordance with the terms of the license agreement you entered into
+# with Polar Mobile Group Inc.
+#
+#########################################################################
+import logging
+
+from optparse import OptionParser
+
+from itty import run_itty
+
+from pyres.horde import Khan
+from pyres import setup_logging
+from pyres.scheduler import Scheduler
+from resweb import server
+from pyres.worker import Worker
+
+
+def pyres_manager():
+    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("-i", '--interval', dest='interval', default=None, help='the default time interval to sleep between runs')
+    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.')
+    parser.add_option("--pool", type="int", dest="pool_size", default=1, help="Number of minions to spawn under the manager.")
+    parser.add_option('-f', dest='logfile', help='If present, a logfile will be used.')
+    (options,args) = parser.parse_args()
+
+    if len(args) != 1:
+        parser.print_help()
+        parser.error("Argument must be a comma seperated list of queues")
+
+    log_level = getattr(logging, options.log_level.upper(), 'INFO')
+    #logging.basicConfig(level=log_level, format="%(asctime)s: %(levelname)s: %(message)s")
+
+    interval = options.interval
+    if interval is not None:
+        interval = float(interval)
+
+    queues = args[0].split(',')
+    server = '%s:%s' % (options.host,options.port)
+    Khan.run(pool_size=options.pool_size, queues=queues, server=server, logging_level=log_level, log_file=options.logfile)
+
+
+def pyres_scheduler():
+    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.')
+    parser.add_option('-f', dest='logfile', help='If present, a logfile will be used.')
+    (options,args) = parser.parse_args()
+    log_level = getattr(logging, options.log_level.upper(),'INFO')
+    #logging.basicConfig(level=log_level, format="%(module)s: %(asctime)s: %(levelname)s: %(message)s")
+    setup_logging(log_level=log_level, filename=options.logfile)
+    server = '%s:%s' % (options.host, options.port)
+    Scheduler.run(server)
+
+
+def pyres_web():
+    usage = "usage: %prog [options]"
+    parser = OptionParser(usage)
+    parser.add_option("--host",
+                    dest="host",
+                    default="localhost",
+                    metavar="HOST")
+    parser.add_option("--port",
+                    dest="port",
+                    type="int",
+                    default=8080)
+    parser.add_option("--dsn",dest="dsn",help="redis server to display")
+    (options,args) = parser.parse_args()
+    if options.dsn:
+        from pyres import ResQ
+        server.HOST = ResQ(options.dsn)
+    run_itty(host=options.host, port=options.port)
+
+
+def pyres_worker():
+    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("-i", '--interval', dest='interval', default=None, help='the default time interval to sleep between runs')
+    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.')
+    parser.add_option('-f', dest='logfile', help='If present, a logfile will be used.')
+    (options,args) = parser.parse_args()
+
+    if len(args) != 1:
+        parser.print_help()
+        parser.error("Argument must be a comma seperated list of queues")
+
+    log_level = getattr(logging, options.log_level.upper(), 'INFO')
+    #logging.basicConfig(level=log_level, format="%(asctime)s: %(levelname)s: %(message)s")
+    setup_logging(log_level=log_level, filename=options.logfile)
+    interval = options.interval
+    if interval is not None:
+        interval = float(interval)
+
+    queues = args[0].split(',')
+    server = '%s:%s' % (options.host,options.port)
+    Worker.run(queues, server, interval)

scripts/pyres_manager

@@ -15,11 +15,13 @@
     download_url='http://cloud.github.com/downloads/binarydud/pyres/pyres-%s.tar.gz' % version,
     include_package_data=True,
     package_data={'resweb': ['templates/*.mustache','media/*']},
-    scripts=[
-        'scripts/pyres_worker',
-        'scripts/pyres_web',
-        'scripts/pyres_scheduler',
-        'scripts/pyres_manager'],
+    entry_points = """\
+    [console_scripts]
+    pyres_manager=pyres.scripts:pyres_manager
+    pyres_scheduler=pyres.scripts:pyres_scheduler
+    pyres_web=pyres.scripts:pyres_web
+    pyres_worker=pyres.scripts:pyres_worker
+    """,
     install_requires=[
         'simplejson>=2.0.9',
         'itty>=0.6.2',