From 8b9b067c062b0c114153d59180bfe91b8b6e341e Mon Sep 17 00:00:00 2001
From: simon987 <me@simon987.net>
Date: Thu, 23 Feb 2023 19:53:05 -0500
Subject: [PATCH] Fix #332

---
 sist2-admin/sist2_admin/sist2.py | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/sist2-admin/sist2_admin/sist2.py b/sist2-admin/sist2_admin/sist2.py
index f7edcc1..8f35866 100644
--- a/sist2-admin/sist2_admin/sist2.py
+++ b/sist2-admin/sist2_admin/sist2.py
@@ -277,23 +277,17 @@ class Sist2:
     @staticmethod
     def _consume_logs_stdout(logs_cb, proc):
         pipe_wrapper = TextIOWrapper(proc.stdout, encoding="utf8", errors="ignore")
-        try:
-            for line in pipe_wrapper:
+        for line in pipe_wrapper:
+            try:
                 if line.strip() == "":
                     continue
                 log_object = json.loads(line)
                 logs_cb(log_object)
-        except Exception as e:
-            proc.kill()
-            try:
-                print(line)
-            except NameError:
-                pass
-            print(traceback.format_exc())
-        finally:
-            pass
-            # proc.wait()
-            # pipe_wrapper.close()
+            except Exception as e:
+                try:
+                    logs_cb({"sist2-admin": f"Could not decode log line: {line}; {e}"})
+                except NameError:
+                    pass
 
     def web(self, options: WebOptions, name: str):