yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

spawn_tor: catch OSError and wrap as ClanError

Browse Source
This commit is contained in:
Jörg Thalheim
2025-08-26 12:12:29 +02:00
parent c45d4cfec9
commit e6066a6cb1
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/clan-cli/clan_lib/network/tor/lib.py
View File

@@ -43,18 +43,22 @@ def spawn_tor() -> Iterator[None]:
cmd_args = ["tor", "--HardwareAccel", "1"] cmd_args = ["tor", "--HardwareAccel", "1"]
packages = ["tor"] packages = ["tor"]
cmd = nix_shell(packages, cmd_args) cmd = nix_shell(packages, cmd_args)
process = Popen(cmd)
try: try:
while not is_tor_running(): process = Popen(cmd)
log.debug("Waiting for Tor to start...") try:
time.sleep(0.2) while not is_tor_running():
log.info("Tor is now running") log.debug("Waiting for Tor to start...")
yield time.sleep(0.2)
finally: log.info("Tor is now running")
log.info("Terminating Tor process...") yield
process.terminate() finally:
process.wait() log.info("Terminating Tor process...")
log.info("Tor process terminated") process.terminate()
process.wait()
log.info("Tor process terminated")
except OSError as e:
msg = f"Failed to spawn tor process with command: {cmd}"
raise ClanError(msg) from e
@dataclass(frozen=True) @dataclass(frozen=True)