cli: make use of load_cfg wrapper

using the wrapper we have cleaner code and
consitent behaviour among all commands

cli/__init__.py

@@ -0,0 +1,18 @@
+import click
+from conf.config_utils import load_configs
+
+
+def die(msg, exit_code=1, fg='red'):
+        click.secho('ERROR: ' + msg, fg=fg, err=True)
+        exit(exit_code)
+
+
+def load_cfg(path, envvar_prefix='LIBREANT_', debug=False):
+    '''wrapper of config_utils.load_configs'''
+    try:
+        return load_configs(envvar_prefix, path=path)
+    except Exception as e:
+        if debug:
+            raise
+        else:
+            die(str(e))

cli/agherant.py

@@ -1,7 +1,7 @@
 import click
 import logging
 
-from conf import config_utils
+from . import load_cfg
 from conf.defaults import get_def_conf, get_help
 from utils.loggers import initLoggers
 from webant.agherant_standalone import main
@@ -18,7 +18,7 @@
 def agherant(settings, debug, port, address, agherant_descriptions):
     initLoggers(logNames=['config_utils'])
     conf = get_def_conf()
-    conf.update(config_utils.load_configs('LIBREANT_', path=settings))
+    conf.update(load_cfg(settings, debug=debug))
     cliConf = {}
     if debug:
         cliConf['DEBUG'] = True
@@ -37,6 +37,7 @@ def agherant(settings, debug, port, address, agherant_descriptions):
             raise
         else:
             click.secho(str(e), fg='yellow', err=True)
+            exit(1)
 
 if __name__ == '__main__':
     agherant()

cli/libreant.py

@@ -2,7 +2,7 @@
 import logging
 import json
 
-from conf import config_utils
+from . import load_cfg
 from conf.defaults import get_def_conf, get_help
 from utils.loggers import initLoggers
 from webant.webant import main
@@ -25,7 +25,7 @@
 def libreant(settings, debug, port, address, fsdb_path, es_indexname, es_hosts, users_db, preset_paths, agherant_descriptions, dump_settings):
     initLoggers(logNames=['config_utils'])
     conf = get_def_conf()
-    conf.update(config_utils.load_configs('LIBREANT_', path=settings))
+    conf.update(load_cfg(settings, debug=debug))
     cliConf = {}
     if debug:
         cliConf['DEBUG'] = True

cli/libreant_db.py

@@ -4,9 +4,9 @@
 import os
 import mimetypes
 
+from . import load_cfg
 from archivant import Archivant
 from archivant.exceptions import NotFoundException
-from conf import config_utils
 from conf.defaults import get_def_conf, get_help
 from utils.loggers import initLoggers
 from custom_types import StringList
@@ -27,7 +27,7 @@ def libreant_db(debug, settings, fsdb_path, es_indexname, es_hosts):
     initLoggers(logNames=['config_utils'])
     global conf
     conf = get_def_conf()
-    conf.update(config_utils.load_configs('LIBREANT_', path=settings))
+    conf.update(load_cfg(settings, debug=debug))
     cliConf = {}
     if debug:
         cliConf['DEBUG'] = True

cli/libreant_users.py

@@ -5,7 +5,7 @@
 import users.api
 import users
 
-from conf import config_utils
+from . import load_cfg
 from conf.defaults import get_def_conf, get_help
 from utils.loggers import initLoggers
 
@@ -34,7 +34,7 @@ def libreant_users(debug, settings, users_db, pretty):
     initLoggers(logNames=['config_utils'])
     global conf
     conf = get_def_conf()
-    conf.update(config_utils.load_configs('LIBREANT_', path=settings))
+    conf.update(load_cfg(settings, debug=debug))
     cliConf = {}
     if debug:
         cliConf['DEBUG'] = True