espressif/esptool
1
0
Fork 0
mirror of https://github.com/espressif/esptool.git synced 2025-10-17 07:32:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(esp_rfc2217): Improved the logger message format

Browse Source
This commit is contained in:
Jakub Kocka
2024-11-12 08:48:34 +01:00
parent 5569aa54b7
commit 39a12a43a2
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
esp_rfc2217_server/__init__.py
View File

@@ -64,8 +64,7 @@ def main():
level = (logging.WARNING, logging.INFO, logging.DEBUG, logging.NOTSET)[ level = (logging.WARNING, logging.INFO, logging.DEBUG, logging.NOTSET)[
args.verbosity args.verbosity
] ]
logging.basicConfig(level=logging.INFO) logging.basicConfig(format="%(levelname)s: %(message)s", level=logging.INFO)
# logging.getLogger('root').setLevel(logging.INFO)
logging.getLogger("rfc2217").setLevel(level) logging.getLogger("rfc2217").setLevel(level)
# connect to serial port # connect to serial port
@@ -75,27 +74,26 @@ def main():
ser.dtr = False ser.dtr = False
ser.rts = False ser.rts = False
logging.info(" RFC 2217 TCP/IP to Serial redirector - type Ctrl-C / BREAK to quit") logging.info("RFC 2217 TCP/IP to Serial redirector - type Ctrl-C / BREAK to quit")
try: try:
ser.open() ser.open()
except serial.SerialException as e: except serial.SerialException as e:
logging.error(" Could not open serial port {}: {}".format(ser.name, e)) logging.error(f"Could not open serial port {ser.name}: {e}")
sys.exit(1) sys.exit(1)
logging.info(" Serving serial port: {}".format(ser.name)) logging.info(f"Serving serial port: {ser.name}")
settings = ser.get_settings() settings = ser.get_settings()
srv = socket.socket(socket.AF_INET, socket.SOCK_STREAM) srv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
srv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) srv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
srv.bind(("", args.localport)) srv.bind(("", args.localport))
srv.listen(1) srv.listen(1)
logging.info(f" TCP/IP port: {args.localport}") logging.info(f"TCP/IP port: {args.localport}")
host_ip = socket.gethostbyname(socket.gethostname()) host_ip = socket.gethostbyname(socket.gethostname())
logging.info( wait_msg = f"Waiting for connection ... use the 'rfc2217://{host_ip}:{args.localport}?ign_set_control' as a PORT"
f"Waiting for connection ... use the 'rfc2217://{host_ip}:{args.localport}?ign_set_control' as a PORT" logging.info(wait_msg)
)
while True: while True:
srv.settimeout(5) srv.settimeout(5)
@@ -111,7 +109,7 @@ def main():
logging.info("Exited with keyboard interrupt") logging.info("Exited with keyboard interrupt")
break break
try: try:
logging.info(f" Connected by {addr[0]}:{addr[1]}") logging.info(f"Connected by {addr[0]}:{addr[1]}")
client_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) client_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
ser.rts = True ser.rts = True
ser.dtr = True ser.dtr = True
@@ -120,7 +118,7 @@ def main():
try: try:
r.shortcircuit() r.shortcircuit()
finally: finally:
logging.info(" Disconnected") logging.info("Disconnected")
r.stop() r.stop()
client_socket.close() client_socket.close()
ser.dtr = False ser.dtr = False
@@ -134,7 +132,7 @@ def main():
except socket.error as msg: except socket.error as msg:
logging.error(str(msg)) logging.error(str(msg))
logging.info(" --- exit ---") logging.info("--- exit ---")
if __name__ == "__main__": if __name__ == "__main__":