zhudongjer/carrot
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

zmq service

Browse Source
This commit is contained in:
ajouatom 2025-02-15 18:08:09 +09:00
parent 464b0bab85
commit 5076d75a3a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
selfdrive/carrot/carrot_man.py
View File

@ -634,12 +634,14 @@ class CarrotMan:
result = subprocess.run(json_obj['echo_cmd'], shell=True, capture_output=True, text=False) result = subprocess.run(json_obj['echo_cmd'], shell=True, capture_output=True, text=False)
try: try:
stdout = result.stdout.decode('utf-8') stdout = result.stdout.decode('utf-8')
stderr = result.stderr.decode('utf-8')
except UnicodeDecodeError: except UnicodeDecodeError:
stdout = result.stdout.decode('euc-kr', 'ignore') stdout = result.stdout.decode('euc-kr', 'ignore')
stderr = result.stderr.decode('euc-kr', 'ignore')
echo = json.dumps({"echo_cmd": json_obj['echo_cmd'], "result": stdout}) echo = json.dumps({"echo_cmd": json_obj['echo_cmd'], "exitStatus": exitStatus, "result": stdout, "error": stderr})
except Exception as e: except Exception as e:
echo = json.dumps({"echo_cmd": json_obj['echo_cmd'], "result": f"exception error: {str(e)}"}) echo = json.dumps({"echo_cmd": json_obj['echo_cmd'], "exitStatus": exitStatus, "result": "", "error": f"exception error: {str(e)}"})
#print(echo) #print(echo)
socket.send(echo.encode()) socket.send(echo.encode())
elif 'tmux_send' in json_obj: elif 'tmux_send' in json_obj: