Improve logic for the get_logs() method. Add rascsi-ctrlboard service. (#714)

python/common/src/rascsi/sys_cmds.py

@@ -149,21 +149,20 @@ class SysCmds:
     def get_logs(lines, scope):
         """
         Takes (int) lines and (str) scope.
+        If scope is a None equivalent, all syslogs are returned.
         Returns either the decoded log output, or the stderr output of journalctl.
         """
-        if scope != "all":
+        line_param = []
-            process = run(
+        scope_param = []
-                    ["journalctl", "-n", lines, "-u", scope],
+        if lines:
-                    capture_output=True,
+            line_param = ["-n", lines]
-                    check=True,
+        if scope:
-                    )
+            scope_param = ["-u", scope]
-        else:
+        process = run(
-            process = run(
+                ["journalctl"] + line_param + scope_param,
-                    ["journalctl", "-n", lines],
+                capture_output=True,
-                    capture_output=True,
+                check=True,
-                    check=True,
+                )
-                    )
-
         if process.returncode == 0:
             return process.returncode, process.stdout.decode("utf-8")
 

python/web/src/templates/index.html

@@ -604,17 +604,20 @@
                 <input name="lines" type="number" value="200" min="1" size="4">
                 <label for="scope">{{ _("Scope:") }}</label>
                 <select name="scope">
-                    <option value="all">
+                    <option value="">
-                        all
+                        {{ _("All logs") }}
                     </option>
                     <option value="rascsi">
-                        rascsi.service
+                        rascsi
                     </option>
                     <option value="rascsi-web">
-                        rascsi-web.service
+                        rascsi-web
                     </option>
                     <option value="rascsi-oled">
-                        rascsi-oled.service
+                        rascsi-oled
+                    </option>
+                    <option value="rascsi-ctrlboard">
+                        rascsi-ctrlboard
                     </option>
                 </select>
                 <input type="submit" value="{{ _("Show Logs") }}">

python/web/src/web.py

@@ -435,8 +435,8 @@ def show_logs():
     """
     Displays system logs
     """
-    lines = request.form.get("lines") or "200"
+    lines = request.form.get("lines")
-    scope = request.form.get("scope") or "all"
+    scope = request.form.get("scope")
 
     returncode, logs = sys_cmd.get_logs(lines, scope)
     if returncode == 0: