fix errors

napisani · Jun 8, 2024 · d225f57 · d225f57
1 parent 786087b
commit d225f57
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/app/server/client.py b/app/server/client.py
@@ -1,4 +1,5 @@
 import http.client
+import json
 from urllib.parse import quote
 
 from app.config import ProcMuxConfig
@@ -15,6 +16,12 @@ def __init__(self, config: ProcMuxConfig):
 
         self._base_url = config.signal_server.host
         self._port = config.signal_server.port
+    def _get_error_message(self, response: http.client.HTTPResponse) -> str:
+        body = response.read()
+        body_json = json.loads(body.decode())
+        if body_json.get('error'):
+            return body_json['error'] 
+        return body.decode()
 
 
     def restart_process(self, name: str):
@@ -23,7 +30,7 @@ def restart_process(self, name: str):
         conn.request("POST", f"/restart-by-name/{name}")
         response = conn.getresponse()
         if response.status != 200:
-            raise ValueError(f"Failed to restart process: {response.status}")
+            raise ValueError(f"Failed to restart process: {response.status} {self._get_error_message(response)}")
         conn.close()
 
     def stop_process(self, name: str):
@@ -32,7 +39,7 @@ def stop_process(self, name: str):
         conn.request("POST", f"/stop-by-name/{name}")
         response = conn.getresponse()
         if response.status != 200:
-            raise ValueError(f"Failed to stop process: {response.status}")
+            raise ValueError(f"Failed to stop process: {response.status} {self._get_error_message(response)}")
         conn.close()
 
 
@@ -41,15 +48,15 @@ def restart_running_processes(self):
         conn.request("POST", "/restart-running")
         response = conn.getresponse()
         if response.status != 200:
-            raise ValueError(f"Failed to restart running processes: {response.status}")
+            raise ValueError(f"Failed to restart running processes: {response.status} {self._get_error_message(response)}")
         conn.close()
 
     def stop_running_processes(self):
         conn = http.client.HTTPConnection(self._base_url,self._port)
         conn.request("POST", "/stop-running")
         response = conn.getresponse()
         if response.status != 200:
-            raise ValueError(f"Failed to stop running processes: {response.status}")
+            raise ValueError(f"Failed to stop running processes: {response.status} {self._get_error_message(response)}")
         conn.close()
 
     def start_process(self, name: str):
@@ -58,15 +65,15 @@ def start_process(self, name: str):
         conn.request("POST", f"/start-by-name/{name}")
         response = conn.getresponse()
         if response.status != 200:
-            raise ValueError(f"Failed to start process: {response.status}")
+            raise ValueError(f"Failed to start process: {response.status}  {self._get_error_message(response)}")
         conn.close()
 
     def get_process_list(self):
         conn = http.client.HTTPConnection(self._base_url,self._port)
         conn.request("GET", "/")
         response = conn.getresponse()
         if response.status != 200:
-            raise ValueError(f"Failed to get process list: {response.status}")
+            raise ValueError(f"Failed to get process list: {response.status} {self._get_error_message(response)}")
         data = response.read()
         conn.close()    
         return data
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
     requirements = fh.read()
 setup(
     name='procmux',
-    version='1.0.10',
+    version='1.0.11',
     author='Nick Pisani',
     author_email='napisani@yahoo.com',
     license='MIT',