diff --git a/aosstower/level_00/influxdb.py b/aosstower/level_00/influxdb.py index c5c48c5d5aa7c4a1a8240f2e6ad91128d9ce50d7..aeb2d54fa813df9c66b938d828e2210f80f16a03 100644 --- a/aosstower/level_00/influxdb.py +++ b/aosstower/level_00/influxdb.py @@ -217,7 +217,7 @@ def main(): ldmp_tables=args.tables, tail_file=args.tail, ) - influxdb_conn_params = {"host": args.host, "port": args.port, "dbname": args.dbname} + influxdb_conn_params = influxdb.convert_influxdb_args_to_kwargs(args) try: influx_gen = convert_to_influx_frame(record_gen, symbols, args.debug) influx_gen = influxdb.grouper(influx_gen, args.bulk) @@ -233,12 +233,14 @@ def main(): except (RuntimeError, ValueError, KeyError, requests.RequestException): if hasattr(record_gen, "close"): record_gen.close() + raise def _create_arg_parser(): import argparse parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.ArgumentDefaultsHelpFormatter) + influxdb.add_influxdb_command_line_arguments(parser) parser.add_argument("--logfn", help="Log to rotating file (Not Implemented)") parser.add_argument( "--debug", @@ -260,9 +262,6 @@ def _create_arg_parser(): help="Treat `src` file as a station name and read records from LoggerNet LDMP server (port: 1024)", ) parser.add_argument("--tables", nargs="*", default=["1"], help="LoggerNet LDMP tables to read in") - parser.add_argument("--host", default=influxdb.DB_HOST, help="Hostname of database connection") - parser.add_argument("--port", default=influxdb.DB_PORT, help="Port of database connection") - parser.add_argument("--dbname", default=influxdb.DB_NAME, help="Name of database to modify") parser.add_argument( "-s", "--station", @@ -328,7 +327,7 @@ def _ingest_loggernet_to_influxdb_and_weatherunderground( for record in influx_gen: if not debug: lines = influxdb.frame_records(record, **station_tags) - influxdb.insert(lines, **influxdb_conn_params) + influxdb.insert(lines, influxdb_conn_params) if not debug and not wu_pw: # we don't plan on doing anything with averaged weatherunderground uploads