From e2942dc8576e773174a92defc6a28045657c5066 Mon Sep 17 00:00:00 2001 From: mario Date: Thu, 9 Apr 2009 20:58:24 +0000 Subject: [PATCH] quickstart option added git-svn-id: http://orbited.org/svn/orbited/trunk@604 fe34127c-c842-0410-aa83-9fc675b9a81c --- daemon/orbited/config.py | 1 - daemon/orbited/start.py | 28 +++++++++++++++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/daemon/orbited/config.py b/daemon/orbited/config.py index 0da84d0..adcd8d8 100644 --- a/daemon/orbited/config.py +++ b/daemon/orbited/config.py @@ -4,7 +4,6 @@ map = { '[global]': { 'proxy.enabled': '1', - 'pid.location': '/tmp/orbited.pid', 'session.ping_interval': '30', 'session.ping_timeout': '30' }, diff --git a/daemon/orbited/start.py b/daemon/orbited/start.py index 44b33f9..bc66e07 100644 --- a/daemon/orbited/start.py +++ b/daemon/orbited/start.py @@ -38,7 +38,6 @@ def _setup_static(root, config): def main(): from optparse import OptionParser parser = OptionParser() - # TODO: this should be in start.py, not here. parser.add_option( "-c", "--config", @@ -62,15 +61,30 @@ def main(): default=False, help="run Orbited with a profiler" ) - - (options, args) = parser.parse_args(sys.argv) - + parser.add_option( + "-q", + "--quickstart", + dest="quickstart", + action="store_true", + default=False, + help="run Orbited on port 8000 and MorbidQ on port 61613" + ) + + (options, args) = parser.parse_args() + if options.version: print "Orbited version: %s" % (version,) sys.exit(0) - # load configuration from configuration file and from command - # line arguments. - config.setup(options=options) + + if options.quickstart: + config.map['[listen]'].append('http://:8000') + config.map['[listen]'].append('stomp://:61613') + config.map['[access]'][('localhost',61613)] = ['*'] + print "Quickstarting Orbited" + else: + # load configuration from configuration + # file and from command line arguments. + config.setup(options=options) logging.setup(config.map)