aljaz/nutshell
1
0
Fork 0
mirror of https://github.com/aljazceru/nutshell.git synced 2025-12-22 19:34:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

dont start tor for platform check

Browse Source
This commit is contained in:
callebtc
2022-10-30 18:00:56 +01:00
parent 6fcc0741be
commit 2587abcd79
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cashu/tor/tor.py
View File

@@ -9,7 +9,7 @@ from loguru import logger
class TorProxy: class TorProxy:
def __init__(self, keep_alive=False): def __init__(self, keep_alive=False, dont_start=False):
self.base_path = pathlib.Path(__file__).parent.resolve() self.base_path = pathlib.Path(__file__).parent.resolve()
self.platform = platform.system() self.platform = platform.system()
self.keep_alive = 60 * 60 if keep_alive else 0 # seconds self.keep_alive = 60 * 60 if keep_alive else 0 # seconds
@@ -27,8 +27,7 @@ class TorProxy:
logger.debug(f"Tor PID in tor.pid: {self.read_pid()}") logger.debug(f"Tor PID in tor.pid: {self.read_pid()}")
logger.debug(f"Tor PID running: {self.signal_pid(self.read_pid())}") logger.debug(f"Tor PID running: {self.signal_pid(self.read_pid())}")
if not self.tor_running: if not self.tor_running and not dont_start:
logger.debug("Starting")
self.run_daemon() self.run_daemon()
@classmethod @classmethod
@@ -41,6 +40,7 @@ class TorProxy:
def run_daemon(self): def run_daemon(self):
if not self.check_platform(): if not self.check_platform():
return return
logger.debug("Starting Tor")
cmd = [f"{self.tor_path()}", "--defaults-torrc", f"{self.tor_config_path()}"] cmd = [f"{self.tor_path()}", "--defaults-torrc", f"{self.tor_config_path()}"]
if self.keep_alive and platform.system() != "Windows": if self.keep_alive and platform.system() != "Windows":
cmd = ["timeout", f"{self.keep_alive}"] + cmd cmd = ["timeout", f"{self.keep_alive}"] + cmd

2
cashu/wallet/cli.py
View File

@@ -72,7 +72,7 @@ def cli(ctx, host: str, walletname: str):
ctx.obj["WALLET_NAME"] = walletname ctx.obj["WALLET_NAME"] = walletname
wallet = Wallet(ctx.obj["HOST"], os.path.join(CASHU_DIR, walletname)) wallet = Wallet(ctx.obj["HOST"], os.path.join(CASHU_DIR, walletname))
if TOR and not TorProxy().check_platform(): if TOR and not TorProxy(dont_start=True).check_platform():
print( print(
"WARNING: Your settings say TOR=true but the built-in Tor bundle is not supported on your system. Your IP will be visible to the mint! Please install Tor manually and set TOR=false and SOCKS_HOST=localhost and SOCKS_PORT=9050 in your Cashu config (recommended) or turn off Tor altogether by setting TOR=false (not recommended)." "WARNING: Your settings say TOR=true but the built-in Tor bundle is not supported on your system. Your IP will be visible to the mint! Please install Tor manually and set TOR=false and SOCKS_HOST=localhost and SOCKS_PORT=9050 in your Cashu config (recommended) or turn off Tor altogether by setting TOR=false (not recommended)."
) )