Skip to content

Commit 4715d66

Browse files
authored
Merge pull request #56 from JE-Chen/dev
Dev
2 parents 1180575 + ba5a2de commit 4715d66

File tree

6 files changed

+41
-24
lines changed

6 files changed

+41
-24
lines changed

.idea/workspace.xml

Lines changed: 24 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

dev_setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="je_auto_control_dev",
8-
version="0.0.39",
8+
version="0.0.41",
99
author="JE-Chen",
1010
author_email="zenmailman@gmail.com",
1111
description="auto testing",

je_auto_control/utils/executor/action_executor.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ def execute_action(self, action_list: [list, dict]) -> dict:
9090
print(repr(error), file=sys.stderr, flush=True)
9191
print(action, file=sys.stderr, flush=True)
9292
record_action_to_list("execute_action", None, repr(error))
93+
execute_record = "execute: " + str(action)
94+
execute_record_dict.update({execute_record: repr(error)})
9395
for key, value in execute_record_dict.items():
9496
print(key, flush=True)
9597
print(value, flush=True)

je_auto_control/utils/socket_server/auto_control_socket_server.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import argparse
1+
import sys
22
import json
33
import socketserver
4-
import sys
54
import threading
65

76
from je_auto_control.utils.executor.action_executor import execute_action
@@ -26,7 +25,13 @@ def handle(self):
2625
socket.sendto("Return_Data_Over_JE".encode("utf-8"), self.client_address)
2726
socket.sendto("\n".encode("utf-8"), self.client_address)
2827
except Exception as error:
29-
print(repr(error))
28+
try:
29+
socket.sendto(str(error).encode("utf-8"), self.client_address)
30+
socket.sendto("\n".encode("utf-8"), self.client_address)
31+
socket.sendto("Return_Data_Over_JE".encode("utf-8"), self.client_address)
32+
socket.sendto("\n".encode("utf-8"), self.client_address)
33+
except Exception as error:
34+
print(repr(error))
3035

3136

3237
class TCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
@@ -37,10 +42,14 @@ def __init__(self, server_address, RequestHandlerClass):
3742

3843

3944
def start_autocontrol_socket_server(host: str = "localhost", port: int = 9938):
45+
if len(sys.argv) == 2:
46+
host = sys.argv[1]
47+
elif len(sys.argv) == 3:
48+
host = sys.argv[1]
49+
port = int(sys.argv[2])
4050
server = TCPServer((host, port), TCPServerHandler)
4151
server_thread = threading.Thread(target=server.serve_forever)
4252
server_thread.daemon = True
4353
server_thread.start()
4454
return server
4555

46-

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="je_auto_control",
8-
version="0.0.105",
8+
version="0.0.107",
99
author="JE-Chen",
1010
author_email="zenmailman@gmail.com",
1111
description="auto testing",

0 commit comments

Comments
 (0)