diff options
author | nico <nico@magicbroccoli.de> | 2020-02-16 20:19:04 +0100 |
---|---|---|
committer | nico <nico@magicbroccoli.de> | 2020-02-16 20:19:04 +0100 |
commit | 89176536adad6e16de10f16cc56826814a90d02e (patch) | |
tree | 04a7d2cdf24673306841fbc443b6a0dc31f14b06 /influx.py | |
parent | 7c656961ce8182dd58ae5265fe01f644f75fa4cf (diff) | |
parent | f02b7e87eddaba1935fb72f26b9dec4b40cb1ac0 (diff) |
Merge branch 'etc_config' into 'master'
utilize /etc/ directory
See merge request sum7/ejabberd-metrics!3
Diffstat (limited to 'influx.py')
-rw-r--r-- | influx.py | 22 |
1 files changed, 9 insertions, 13 deletions
@@ -1,12 +1,10 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- - -import json -import os import time from influxdb import InfluxDBClient +from config import Config from ejabberdrpc import EjabberdMetrics @@ -79,19 +77,17 @@ class Influx: if __name__ == '__main__': # load config - path = os.path.dirname(__file__) - with open('/'.join([path, 'config.json']), 'r', encoding='utf-8') as f: - config = json.load(f) + config = Config() - # creds and params - url = config['url'] if 'url' in config else 'http://localhost:5280/api' - login = config['login'] if 'login' in config else None - api = config['api'] if 'api' in config else 'rest' + # credentials and parameters + url = config.get('url', default='http://localhost:5280/api') + login = config.get('login', default=None) + api = config.get('api', default='rest') # config influxdb - influx_host = config['influxdb_host'] if 'influxdb_host' in config else 'localhost' - influx_port = config['influxdb_port'] if 'influxdb_port' in config else 8086 - influx_dbname = config['influxdb_db'] if 'influxdb_db' in config else 'ejabberd' + influx_host = config.get('influxdb_host', default='localhost') + influx_port = config.get('influxdb_port', default=8086) + influx_dbname = config.get('influxdb_db', default='ejabberd') # init handler metrics = EjabberdMetrics(url, login, api) |