itdominator
/
Python-With-Gtk-Template
Template
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

In effect addeed socket recovery logic; added deubug hook

This commit is contained in:
itdominator 2023-10-18 21:02:46 -05:00
parent 37d7075079
commit a85bdcf019
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app.py
View File

@ -25,7 +25,7 @@ class Application(IPCServer):
try: try:
self.create_ipc_listener() self.create_ipc_listener()
except Exception: except Exception:
... self.socket_realization_check()
if not self.is_ipc_alive: if not self.is_ipc_alive:
for arg in unknownargs + [args.new_tab,]: for arg in unknownargs + [args.new_tab,]:
@ -35,6 +35,16 @@ class Application(IPCServer):
raise AppLaunchException(f"{app_name} IPC Server Exists: Will send path(s) to it and close...") raise AppLaunchException(f"{app_name} IPC Server Exists: Will send path(s) to it and close...")
self.setup_debug_hook()
Window(args, unknownargs)
def socket_realization_check(self):
self.send_test_ipc_message()
self.create_ipc_listener()
def setup_debug_hook(self):
try: try:
# kill -SIGUSR2 <pid> from Linux/Unix or SIGBREAK signal from Windows # kill -SIGUSR2 <pid> from Linux/Unix or SIGBREAK signal from Windows
signal.signal( signal.signal(
@ -44,5 +54,3 @@ class Application(IPCServer):
except ValueError: except ValueError:
# Typically: ValueError: signal only works in main thread # Typically: ValueError: signal only works in main thread
... ...
Window(args, unknownargs)

28
src/utils/ipc_server.py
View File

@ -62,15 +62,14 @@ class IPCServer(Singleton):
start_time = time.perf_counter() start_time = time.perf_counter()
self._handle_ipc_message(conn, start_time) self._handle_ipc_message(conn, start_time)
except Exception as e: except Exception as e:
... logger.debug( repr(e) )
listener.close() listener.close()
def _handle_ipc_message(self, conn, start_time) -> None: def _handle_ipc_message(self, conn, start_time) -> None:
while True: while True:
msg = conn.recv() msg = conn.recv()
if settings_manager.is_debug(): logger.debug(msg)
print(msg)
if "FILE|" in msg: if "FILE|" in msg:
file = msg.split("FILE|")[1].strip() file = msg.split("FILE|")[1].strip()
@ -109,6 +108,25 @@ class IPCServer(Singleton):
conn.send(message) conn.send(message)
conn.close() conn.close()
except ConnectionRefusedError as e: except ConnectionRefusedError as e:
print("Connection refused...") logger.error("Connection refused...")
except Exception as e: except Exception as e:
print(repr(e)) logger.error( repr(e) )
def send_test_ipc_message(self, message: str = "Empty Data...") -> None:
try:
if self._conn_type == "socket":
conn = Client(address=self._ipc_address, family="AF_UNIX", authkey=self._ipc_authkey)
elif "unsecured" not in self._conn_type:
conn = Client((self._ipc_address, self._ipc_port), authkey=self._ipc_authkey)
else:
conn = Client((self._ipc_address, self._ipc_port))
conn.send(message)
conn.close()
except ConnectionRefusedError as e:
if self._conn_type == "socket":
logger.error("IPC Socket no longer valid.... Removing.")
os.unlink(self._ipc_address)
except Exception as e:
logger.error( repr(e) )