ble

functionland · Dec 11, 2024 · 7c04ee5 · 7c04ee5
1 parent 464957d
commit 7c04ee5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/docker/fxsupport/linux/bluetooth.py b/docker/fxsupport/linux/bluetooth.py
@@ -104,7 +104,7 @@ def prepare_response(self, response):
             "index": 999,  # Use max possible index digits
             "data": ""
         }
-        metadata_size = len(json.dumps(chunk_template)) * 2
+        metadata_size = len(json.dumps(chunk_template)) * 2 + 3
         max_data_size = self.mtu_size - metadata_size
 
         # Calculate chunks needed

diff --git a/docker/fxsupport/linux/local_command_server.py b/docker/fxsupport/linux/local_command_server.py
@@ -87,10 +87,16 @@ def get_logs(self, params):
             docker_logs = {}
             for container in data.get('docker', []):
                 if container:
-                    cmd = f"sudo docker logs {container} --tail 5"
+                    cmd = f"sudo docker logs {container} --tail 6"
                     try:
-                        output = subprocess.check_output(cmd, shell=True).decode('utf-8')
-                        docker_logs[container] = output
+                        # Capture both stdout and stderr
+                        output = subprocess.check_output(
+                            cmd,
+                            shell=True,
+                            stderr=subprocess.STDOUT,  # Redirect stderr to stdout
+                            universal_newlines=True    # Handle text output properly
+                        )
+                        docker_logs[container] = output if output else "No logs available"
                     except subprocess.CalledProcessError as e:
                         docker_logs[container] = f"Error: {str(e)}"
             result['docker'] = docker_logs