Merge branch 'yaml' into 'master'

yaml config

See merge request sum7/ejabberd-metrics!4

1 files changed, 9 insertions, 6 deletions

diff --git a/config.py b/config.py
index da20e66..20793e8 100644
--- a/config.py
+++ b/config.py
@@ -1,20 +1,23 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-import json
 import sys
 from os import environ
 from pathlib import Path
 
+from ruamel.yaml import YAML
+from ruamel.yaml.parser import ParserError
+from ruamel.yaml.scanner import ScannerError
+
 
 class Config:
     def __init__(self):
         # class variables
         self.content = None
-        self.conf_file = Path('/etc/ejabberd-metrics.conf')
+        self.conf_file = Path('/etc/ejabberd-metrics.yml')
 
         # dev config overwrite
         if environ.get('ejabberd_metrics_dev'):
-            self.conf_file = Path('config.json')
+            self.conf_file = Path('config.yml')
 
         # read config file
         self._read()
@@ -23,13 +26,13 @@ class Config:
         """init the config object with this method"""
         self._check()
 
-        # open and load json content from config
+        # open file as an iostream
         with open(self.conf_file, 'r', encoding='utf-8') as f:
             try:
-                self.content = json.load(f)
+                self.content = YAML(typ='safe').load(f)
 
             # catch json decoding errors
-            except json.JSONDecodeError as err:
+            except (ParserError, ScannerError) as err:
                 print(err, file=sys.stderr)
                 exit(1)