From a5a39958cc37f1415457d8361d7bcde5c1d34325 Mon Sep 17 00:00:00 2001 From: genofire Date: Sat, 7 Dec 2019 16:01:03 +0100 Subject: improve configuration (with default values) - also for testing ejabberdrpc.py --- influx.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'influx.py') diff --git a/influx.py b/influx.py index 049bef0..b267e23 100644 --- a/influx.py +++ b/influx.py @@ -83,12 +83,21 @@ if __name__ == "__main__": with open("/".join([path, "config.json"]), "r", encoding="utf-8") as f: config = json.load(f) + url = config['url'] if "url" in config else "http://localhost:4560" + login = config['login'] if "login" in config else None + api = config['api'] if "api" in config else "rpc" + + # config influxdb + influxdb_host = config['influxdb_host'] if "influxdb_host" in config else "localhost" + influxdb_port = config['influxdb_port'] if "influxdb_port" in config else 8086 + influxdb_database = config['database'] if "database" in config else "ejabberd" + # init global handler - metrics = EjabberdMetrics("http://localhost:4560", config['login']) - client = InfluxDBClient(host='localhost', port=8086, database=config['database'], retries=5) + metrics = EjabberdMetrics(url, login, api) + client = InfluxDBClient(host=influxdb_host, port=influxdb_port, database=influxdb_database, retries=5) # create database only once - client.create_database(config['database']) + client.create_database(influxdb_database) # init influx class influx = Influx(metrics, client) -- cgit v1.2.3-18-g5258