diff --git a/brozzler/webconsole/__init__.py b/brozzler/webconsole/__init__.py index 2044110..bff8532 100644 --- a/brozzler/webconsole/__init__.py +++ b/brozzler/webconsole/__init__.py @@ -56,7 +56,7 @@ SETTINGS = { 'RETHINKDB_SERVERS', 'localhost').split(','), 'RETHINKDB_DB': os.environ.get('RETHINKDB_DB', 'brozzler'), 'WAYBACK_BASEURL': os.environ.get( - 'WAYBACK_BASEURL', 'http://wbgrp-svc107.us.archive.org:8091'), + 'WAYBACK_BASEURL', 'http://localhost:8091/brozzler'), } r = rethinkstuff.Rethinker( SETTINGS['RETHINKDB_SERVERS'], db=SETTINGS['RETHINKDB_DB']) @@ -221,7 +221,26 @@ except ImportError: logging.info('running brozzler-webconsole using simple flask app.run') app.run() -if __name__ == "__main__": - # arguments? +def main(): + import argparse + arg_parser = argparse.ArgumentParser( + prog=os.path.basename(sys.argv[0]), + formatter_class=argparse.RawDescriptionHelpFormatter, + description=( + 'brozzler-webconsole - web application for viewing brozzler ' + 'crawl status'), + epilog=( + 'brozzler-webconsole has no command line options, but can be ' + 'configured using the following environment variables:\n\n' + ' RETHINKDB_SERVERS rethinkdb servers, e.g. db0.foo.org,' + 'db0.foo.org:38015,db1.foo.org (default: localhost)\n' + ' RETHINKDB_DB rethinkdb database name (default: ' + 'brozzler)\n' + ' WAYBACK_BASEURL base url for constructing wayback ' + 'links (default http://localhost:8091/brozzler)')) + args = arg_parser.parse_args(args=sys.argv[1:]) run() +if __name__ == "__main__": + main() + diff --git a/setup.py b/setup.py index ba8484e..190bfbe 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ def find_package_data(package): setuptools.setup( name='brozzler', - version='1.1b6.dev69', + version='1.1b6.dev70', description='Distributed web crawling with browsers', url='https://github.com/internetarchive/brozzler', author='Noah Levitt', @@ -51,7 +51,7 @@ setuptools.setup( 'brozzler-new-site=brozzler.cli:brozzler_new_site', 'brozzler-worker=brozzler.cli:brozzler_worker', 'brozzler-ensure-tables=brozzler.cli:brozzler_ensure_tables', - 'brozzler-webconsole=brozzler.webconsole:run', + 'brozzler-webconsole=brozzler.webconsole:main', 'brozzler-easy=brozzler.easy:main', ], },