From 233c962710aec0e98f77936bde476fe662ca062f Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Wed, 22 Apr 2020 16:49:35 +0200
Subject: [PATCH] Hmpf idk another iteration to cleaning attempt

---
 bin/yunohost     | 26 +++++++++++---------------
 bin/yunohost-api | 23 +++++++++--------------
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/bin/yunohost b/bin/yunohost
index 173cbc1cb..8c4b10d8d 100755
--- a/bin/yunohost
+++ b/bin/yunohost
@@ -7,19 +7,13 @@ import argparse
 import glob
 
 import moulinette
-from moulinette.interfaces.cli import colorize, get_locale
 
 # Directory and file to be used by logging
 LOG_DIR = '/var/log/yunohost'
 LOG_FILE = 'yunohost-cli.log'
 
-# Create log directory
-if not os.path.isdir(LOG_DIR):
-    os.makedirs(LOG_DIR, 0750)
-
 # Initialization & helpers functions -----------------------------------
 
-
 def _parse_cli_args():
     """Parse additional arguments for the cli"""
     parser = argparse.ArgumentParser(add_help=False)
@@ -58,11 +52,13 @@ def _parse_cli_args():
     return (parser, opts, args)
 
 
-def _init_moulinette(debug=False, quiet=False):
-    """Configure logging and initialize the moulinette"""
+def init(debug=False, quiet=False, logfile='%s/%s' % (LOG_DIR, LOG_FILE)):
 
-    # Custom logging configuration
-    logging = {
+    logdir = os.path.dirname(logfile)
+    if not os.path.isdir(logdir):
+        os.makedirs(logdir, 0750)
+
+    moulinette.init(logging_config={
         'version': 1,
         'disable_existing_loggers': True,
         'formatters': {
@@ -87,7 +83,7 @@ def _init_moulinette(debug=False, quiet=False):
             'file': {
                 'class': 'logging.FileHandler',
                 'formatter': 'precise',
-                'filename': '%s/%s' % (LOG_DIR, LOG_FILE),
+                'filename': logfile,
                 'filters': ['action'],
             },
         },
@@ -112,10 +108,8 @@ def _init_moulinette(debug=False, quiet=False):
             'level': 'DEBUG',
             'handlers': ['file', 'tty'] if debug else ['file'],
         },
-    }
+    })
 
-    # Initialize moulinette
-    moulinette.init(logging_config=logging)
 
 
 def _retrieve_namespaces():
@@ -139,7 +133,7 @@ if __name__ == '__main__':
         sys.exit(1)
 
     parser, opts, args = _parse_cli_args()
-    _init_moulinette(opts.debug, opts.quiet)
+    init(debug=opts.debug, quiet=opts.quiet)
 
     # Check that YunoHost is installed
     allowed_if_not_installed = ['tools postinstall', 'backup restore', 'log display']
@@ -147,6 +141,8 @@ if __name__ == '__main__':
        (len(args) < 2 or (args[0] + ' ' + args[1] not in allowed_if_not_installed)):
 
         from moulinette import m18n
+        from moulinette.interfaces.cli import colorize, get_locale
+
         # Init i18n
         m18n.load_namespace('yunohost')
         m18n.set_locale(get_locale())
diff --git a/bin/yunohost-api b/bin/yunohost-api
index 7a2119a08..0b6961a90 100755
--- a/bin/yunohost-api
+++ b/bin/yunohost-api
@@ -16,10 +16,6 @@ DEFAULT_PORT = 6787
 LOG_DIR = '/var/log/yunohost'
 LOG_FILE = 'yunohost-api.log'
 
-# Create log directory
-if not os.path.isdir(LOG_DIR):
-    os.makedirs(LOG_DIR, 0750)
-
 # Initialization & helpers functions -----------------------------------
 
 
@@ -49,11 +45,13 @@ def _parse_api_args():
     return parser.parse_args()
 
 
-def _init_moulinette(debug=False):
-    """Configure logging and initialize the moulinette"""
+def init_api(debug=False, logfile='%s/%s' % (LOG_DIR, LOG_FILE)):
 
-    # Custom logging configuration
-    logging = {
+    logdir = os.path.dirname(logfile)
+    if not os.path.isdir(logdir):
+        os.makedirs(logdir, 0750)
+
+    moulinette.init(logging_config={
         'version': 1,
         'disable_existing_loggers': True,
         'formatters': {
@@ -77,7 +75,7 @@ def _init_moulinette(debug=False):
             'file': {
                 'class': 'logging.handlers.WatchedFileHandler',
                 'formatter': 'precise',
-                'filename': '%s/%s' % (LOG_DIR, LOG_FILE),
+                'filename': logfile,
                 'filters': ['action'],
             },
             'console': {
@@ -103,10 +101,7 @@ def _init_moulinette(debug=False):
             'level': 'DEBUG',
             'handlers': ['file'] + ['console'] if debug else [],
         },
-    }
-
-    # Initialize moulinette
-    moulinette.init(logging_config=logging)
+    })
 
 # Callbacks for additional routes --------------------------------------
 
@@ -120,7 +115,7 @@ def is_installed():
 
 if __name__ == '__main__':
     opts = _parse_api_args()
-    _init_moulinette(opts.debug)
+    init_api(opts.debug)
 
     extensions = [f.split('/')[-1][:-4] for f in glob.glob("/usr/share/moulinette/actionsmap/ynh_*.yml")]