Permalink
Browse files

Merge branch 'runServer'

  • Loading branch information...
2 parents 68d9b0e + 63a3583 commit 5efa07de86a71974eaef43c893a0e95dac6efd41 @ctb committed Apr 17, 2010
Showing with 10 additions and 3 deletions.
  1. +6 −1 client/pony_client.py
  2. +4 −2 pony_build/web/run.py
View
@@ -17,6 +17,8 @@
from optparse import OptionParser
import pprint
import glob
+import datetime
+import signal
pb_servers = {
'pb-dev' : 'http://lyorn.idyll.org/ctb/pb-dev/xmlrpc',
@@ -91,7 +93,10 @@ def _replace_variables(cmd, variables_d):
cmd = variables_d[cmd[3:]]
return cmd
-def _run_command(command_list, cwd=None, variables=None, extra_kwargs={}):
+
+def _run_command(command_list, timeout=None, cwd=None, variables=None, extra_kwargs={},
+ verbose=False):
+
if variables:
x = []
for cmd in command_list:
View
@@ -11,6 +11,9 @@
help='interface to bind', default='localhost')
parser.add_option('-p', '--port', dest='port', help='port to bind',
type='int', default='5000')
+ parser.add_option('-f', '--dbfile', dest='dbfile',
+ help='database filename', type='string',
+ default=':memory:')
parser.add_option('-u', '--url', dest='url', help='public URL',
default=None)
parser.add_option('-P', '--use-pubsubhubbub', dest='use_pubsubhubbub',
@@ -22,11 +25,10 @@
(options, args) = parser.parse_args()
- dbfile=args[0]
push_server = None
if options.use_pubsubhubbub:
push_server = options.push_server
- qx_web.run(options.interface, options.port, dbfile, public_url=options.url,
+ qx_web.run(options.interface, options.port, options.dbfile, public_url=options.url,
pubsubhubbub_server=push_server)

0 comments on commit 5efa07d

Please sign in to comment.