organize imports, tweak command line args

This commit is contained in:
Noah Levitt 2014-05-20 17:10:41 -07:00
parent d4693b2aba
commit 6c69b68771
2 changed files with 6 additions and 9 deletions

View file

@ -1,12 +1,9 @@
#!/usr/bin/env python #!/usr/bin/env python
# vim: set sw=4 et: # vim: set sw=4 et:
from json import dumps, loads import os
import os,sys,argparse, urllib.request, urllib.error, urllib.parse import sys
import websocket import argparse
import time
import uuid
import logging import logging
import threading
from kombu import Connection, Exchange, Queue from kombu import Connection, Exchange, Queue
arg_parser = argparse.ArgumentParser(prog=os.path.basename(sys.argv[0]), arg_parser = argparse.ArgumentParser(prog=os.path.basename(sys.argv[0]),

View file

@ -23,16 +23,16 @@ if __name__=="__main__":
formatter_class=argparse.ArgumentDefaultsHelpFormatter) formatter_class=argparse.ArgumentDefaultsHelpFormatter)
arg_parser.add_argument('-w', '--browser-wait', dest='browser_wait', default='60', arg_parser.add_argument('-w', '--browser-wait', dest='browser_wait', default='60',
help='Seconds to wait for browser initialization') help='Seconds to wait for browser initialization')
arg_parser.add_argument('-e', '--executable', dest='executable', default='chromium-browser', arg_parser.add_argument('-e', '--executable', dest='chrome_exe', default='chromium-browser',
help='Executable to use to invoke chrome') help='Executable to use to invoke chrome')
arg_parser.add_argument('-u', '--url', dest='amqp_url', default='amqp://guest:guest@localhost:5672/%2f', arg_parser.add_argument('-u', '--url', dest='amqp_url', default='amqp://guest:guest@localhost:5672/%2f',
help='URL identifying the amqp server to talk to') help='URL identifying the amqp server to talk to')
arg_parser.add_argument('-n', '--max-workers', dest='max_browsers', default='3', arg_parser.add_argument('-n', '--max-browsers', dest='max_browsers', default='3',
help='Max number of chrome instances simultaneously browsing pages') help='Max number of chrome instances simultaneously browsing pages')
args = arg_parser.parse_args(args=sys.argv[1:]) args = arg_parser.parse_args(args=sys.argv[1:])
controller = umbra.controller.AmqpBrowserController(args.amqp_url, controller = umbra.controller.AmqpBrowserController(args.amqp_url,
args.executable, args.browser_wait, args.chrome_exe, args.browser_wait,
max_active_browsers=int(args.max_browsers)) max_active_browsers=int(args.max_browsers))
try: try:
while True: while True: