thePR0M3TH3AN/seedPass
1
0
Fork 0
mirror of https://github.com/PR0M3TH3AN/SeedPass.git synced 2025-09-08 07:18:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix exit crash when nostr client missing

Browse Source
This commit is contained in:
thePR0M3TH3AN
2025-08-01 09:28:49 -04:00
parent 05d4bd94b6
commit 144751ef02
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main.py
View File

@@ -459,10 +459,21 @@ def handle_view_relays(cfg_mgr: "ConfigManager") -> None:
print(colored(f"Error: {e}", "red")) print(colored(f"Error: {e}", "red"))
def _safe_close_client_pool(pm: PasswordManager) -> None:
"""Close the Nostr client pool if the client exists."""
client = getattr(pm, "nostr_client", None)
if client is None:
return
try:
client.close_client_pool()
except Exception as exc:
logging.error(f"Error during NostrClient shutdown: {exc}")
def _reload_relays(password_manager: PasswordManager, relays: list) -> None: def _reload_relays(password_manager: PasswordManager, relays: list) -> None:
"""Reload NostrClient with the updated relay list.""" """Reload NostrClient with the updated relay list."""
try: try:
password_manager.nostr_client.close_client_pool() _safe_close_client_pool(password_manager)
except Exception as exc: except Exception as exc:
logging.warning(f"Failed to close client pool: {exc}") logging.warning(f"Failed to close client pool: {exc}")
try: try:
@@ -1051,7 +1062,7 @@ def display_menu(
logging.info("Exiting the program.") logging.info("Exiting the program.")
print(colored("Exiting the program.", "green")) print(colored("Exiting the program.", "green"))
getattr(password_manager, "cleanup", lambda: None)() getattr(password_manager, "cleanup", lambda: None)()
password_manager.nostr_client.close_client_pool() _safe_close_client_pool(password_manager)
sys.exit(0) sys.exit(0)
if choice == "1": if choice == "1":
while True: while True:
@@ -1255,7 +1266,7 @@ def main(argv: list[str] | None = None, *, fingerprint: str | None = None) -> in
logging.info(f"Received shutdown signal: {sig}. Initiating graceful shutdown.") logging.info(f"Received shutdown signal: {sig}. Initiating graceful shutdown.")
try: try:
getattr(password_manager, "cleanup", lambda: None)() getattr(password_manager, "cleanup", lambda: None)()
password_manager.nostr_client.close_client_pool() _safe_close_client_pool(password_manager)
logging.info("NostrClient closed successfully.") logging.info("NostrClient closed successfully.")
except Exception as exc: except Exception as exc:
logging.error(f"Error during shutdown: {exc}") logging.error(f"Error during shutdown: {exc}")
@@ -1274,7 +1285,7 @@ def main(argv: list[str] | None = None, *, fingerprint: str | None = None) -> in
print(colored("\nProgram terminated by user.", "yellow")) print(colored("\nProgram terminated by user.", "yellow"))
try: try:
getattr(password_manager, "cleanup", lambda: None)() getattr(password_manager, "cleanup", lambda: None)()
password_manager.nostr_client.close_client_pool() _safe_close_client_pool(password_manager)
logging.info("NostrClient closed successfully.") logging.info("NostrClient closed successfully.")
except Exception as exc: except Exception as exc:
logging.error(f"Error during shutdown: {exc}") logging.error(f"Error during shutdown: {exc}")
@@ -1285,7 +1296,7 @@ def main(argv: list[str] | None = None, *, fingerprint: str | None = None) -> in
print(colored(f"Error: {e}", "red")) print(colored(f"Error: {e}", "red"))
try: try:
getattr(password_manager, "cleanup", lambda: None)() getattr(password_manager, "cleanup", lambda: None)()
password_manager.nostr_client.close_client_pool() _safe_close_client_pool(password_manager)
logging.info("NostrClient closed successfully.") logging.info("NostrClient closed successfully.")
except Exception as exc: except Exception as exc:
logging.error(f"Error during shutdown: {exc}") logging.error(f"Error during shutdown: {exc}")
@@ -1296,7 +1307,7 @@ def main(argv: list[str] | None = None, *, fingerprint: str | None = None) -> in
print(colored(f"Error: An unexpected error occurred: {e}", "red")) print(colored(f"Error: An unexpected error occurred: {e}", "red"))
try: try:
getattr(password_manager, "cleanup", lambda: None)() getattr(password_manager, "cleanup", lambda: None)()
password_manager.nostr_client.close_client_pool() _safe_close_client_pool(password_manager)
logging.info("NostrClient closed successfully.") logging.info("NostrClient closed successfully.")
except Exception as exc: except Exception as exc:
logging.error(f"Error during shutdown: {exc}") logging.error(f"Error during shutdown: {exc}")