diff --git a/setup.py b/setup.py index 5c159a0..e1b5bd8 100755 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ except: setuptools.setup( name='warcprox', - version='2.1b1.dev93', + version='2.1b1.dev94', description='WARC writing MITM HTTP/S proxy', url='https://github.com/internetarchive/warcprox', author='Noah Levitt', diff --git a/warcprox/main.py b/warcprox/main.py index 0940593..25fb3dc 100644 --- a/warcprox/main.py +++ b/warcprox/main.py @@ -113,6 +113,9 @@ def _build_arg_parser(prog=os.path.basename(sys.argv[0])): arg_parser.add_argument('--rethinkdb-big-table', dest='rethinkdb_big_table', action='store_true', default=False, help='use a big rethinkdb table called "captures", instead of a small table called "dedup"; table is suitable for use as index for playback (ignored unless --rethinkdb-servers is specified)') + arg_parser.add_argument( + '--rethinkdb-big-table-name', dest='rethinkdb_big_table_name', + default='captures', help=argparse.SUPPRESS) arg_parser.add_argument('--kafka-broker-list', dest='kafka_broker_list', default=None, help='kafka broker list for capture feed') arg_parser.add_argument('--kafka-capture-feed-topic', dest='kafka_capture_feed_topic', @@ -169,7 +172,8 @@ def init_controller(args): rr = doublethink.Rethinker( args.rethinkdb_servers.split(","), args.rethinkdb_db) if args.rethinkdb_big_table: - captures_db = warcprox.bigtable.RethinkCaptures(rr, options=options) + captures_db = warcprox.bigtable.RethinkCaptures( + rr, table=args.rethinkdb_big_table_name, options=options) dedup_db = warcprox.bigtable.RethinkCapturesDedup( captures_db, options=options) listeners.append(captures_db)