utilize /etc/ directory

+ add config.py to read / touch create the etc config file

1 files changed, 9 insertions, 13 deletions

diff --git a/influx.py b/influx.py
index 36d7a47..59728ac 100644
--- a/influx.py
+++ b/influx.py
@@ -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)