Merge pull request #624 from kay0u/enh-add-systemd-logs-for-apps

[enh] add systemd logs

data/actionsmap/yunohost.yml

@@ -1149,6 +1149,14 @@ service:
                 -d:
                     full: --description
                     help: Description of the service
+                -t:
+                    full: --log_type
+                    help: Type of the log (file or systemd)
+                    nargs: "+"
+                    choices:
+                        - file
+                        - systemd
+                    default: file
 
         ### service_remove()
         remove:

src/yunohost/service.py

@@ -49,7 +49,7 @@ MOULINETTE_LOCK = "/var/run/moulinette_yunohost.lock"
 logger = log.getActionLogger('yunohost.service')
 
 
-def service_add(name, status=None, log=None, runlevel=None, need_lock=False, description=None):
+def service_add(name, status=None, log=None, runlevel=None, need_lock=False, description=None, log_type="file"):
     """
     Add a custom service
 
@@ -60,6 +60,7 @@ def service_add(name, status=None, log=None, runlevel=None, need_lock=False, des
         runlevel -- Runlevel priority of the service
         need_lock -- Use this option to prevent deadlocks if the service does invoke yunohost commands.
         description -- description of the service
+        log_type -- Precise if the corresponding log is a file or a systemd log
     """
     services = _get_services()
 
@@ -69,8 +70,23 @@ def service_add(name, status=None, log=None, runlevel=None, need_lock=False, des
         services[name] = {'status': status}
 
     if log is not None:
+        if not isinstance(log, list):
+            log = [log]
+
         services[name]['log'] = log
 
+        if not isinstance(log_type, list):
+            log_type = [log_type]
+
+        if len(log_type) < len(log):
+            log_type.extend([log_type[-1]] * (len(log) - len(log_type))) # extend list to have the same size as log
+
+        if len(log_type) == len(log):
+            services[name]['log_type'] = log_type
+        else:
+            raise YunohostError('service_add_failed', service=name)
+
+
     if runlevel is not None:
         services[name]['runlevel'] = runlevel
 
@@ -367,28 +383,37 @@ def service_log(name, number=50):
         raise YunohostError('service_no_log', service=name)
 
     log_list = services[name]['log']
+    log_type_list = services[name].get('log_type', [])
 
     if not isinstance(log_list, list):
         log_list = [log_list]
+    if len(log_type_list) < len(log_list):
+        log_type_list.extend(["file"] * (len(log_list)-len(log_type_list)))
 
     result = {}
 
-    for log_path in log_list:
+    for index, log_path in enumerate(log_list):
-        # log is a file, read it
+        log_type = log_type_list[index]
-        if not os.path.isdir(log_path):
-            result[log_path] = _tail(log_path, int(number)) if os.path.exists(log_path) else []
-            continue
 
-        for log_file in os.listdir(log_path):
+        if log_type == "file":
-            log_file_path = os.path.join(log_path, log_file)
+            # log is a file, read it
-            # not a file : skip
+            if not os.path.isdir(log_path):
-            if not os.path.isfile(log_file_path):
+                result[log_path] = _tail(log_path, int(number)) if os.path.exists(log_path) else []
                 continue
 
-            if not log_file.endswith(".log"):
+            for log_file in os.listdir(log_path):
-                continue
+                log_file_path = os.path.join(log_path, log_file)
+                # not a file : skip
+                if not os.path.isfile(log_file_path):
+                    continue
 
-            result[log_file_path] = _tail(log_file_path, int(number)) if os.path.exists(log_file_path) else []
+                if not log_file.endswith(".log"):
+                    continue
+
+                result[log_file_path] = _tail(log_file_path, int(number)) if os.path.exists(log_file_path) else []
+        else:
+            # get log with journalctl
+            result[log_path] = _get_journalctl_logs(log_path, int(number)).splitlines()
 
     return result
 
@@ -1047,9 +1072,9 @@ def manually_modified_files():
     return output
 
 
-def _get_journalctl_logs(service):
+def _get_journalctl_logs(service, number="all"):
     try:
-        return subprocess.check_output("journalctl -xn -u %s" % service, shell=True)
+        return subprocess.check_output("journalctl -xn -u {0} -n{1}".format(service, number), shell=True)
     except:
         import traceback
         return "error while get services logs from journalctl:\n%s" % traceback.format_exc()