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 --- ejabberdrpc.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) mode change 100644 => 100755 ejabberdrpc.py (limited to 'ejabberdrpc.py') diff --git a/ejabberdrpc.py b/ejabberdrpc.py old mode 100644 new mode 100755 index 4cdaf88..0e20986 --- a/ejabberdrpc.py +++ b/ejabberdrpc.py @@ -319,8 +319,18 @@ class EjabberdMetrics(): if __name__ == "__main__": - from json import dumps - metric = EjabberdMetrics("http://[::1]:5280/api", api="rest") + import os + import json + # load config + path = os.path.dirname(__file__) + 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://[::1]:5280/api" + login = config['login'] if "login" in config else None + api = config['api'] if "api" in config else "rest" + + metric = EjabberdMetrics(url, login=login, api=api) data = metric.get_all() - print(dumps(data, indent=True)) + print(json.dumps(data, indent=True)) -- cgit v1.2.3-54-g00ecf