open.source/whoogle-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using if else instead of try except.

Browse Source
This commit is contained in:
MadcowOG 2022-05-05 10:46:49 -07:00
parent 1fff49dc22
commit 251ef19666
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/__init__.py
View File

@ -149,11 +149,12 @@ app.jinja_env.globals.update(
Session(app) Session(app)
# Attempt to acquire tor identity, to determine if Tor config is available # Attempt to acquire tor identity, to determine if Tor config is available
try: confloc=os.getenv('WHOOGLE_TOR_CONF')
if confloc is not None and os.path.isfile(confloc):
send_tor_signal( send_tor_signal(
Signal.HEARTBEAT, Signal.HEARTBEAT,
confloc=os.getenv('WHOOGLE_TOR_CONF')) confloc=confloc)
except TypeError: else:
send_tor_signal(Signal.HEARTBEAT) send_tor_signal(Signal.HEARTBEAT)
from app import routes # noqa from app import routes # noqa

1
app/request.py
View File

@ -64,6 +64,7 @@ def send_tor_signal(signal: Signal, confloc='./misc/tor/control.conf') -> bool:
os.environ['TOR_AVAILABLE'] = '1' os.environ['TOR_AVAILABLE'] = '1'
return True return True
except (SocketError, ConnectionRefusedError, ConnectionError): except (SocketError, ConnectionRefusedError, ConnectionError):
# If neither words tor isn't configured correctly, or not set up.
os.environ['TOR_AVAILABLE'] = '0' os.environ['TOR_AVAILABLE'] = '0'
print( print(
"Unable to authenticate with tor control port." + "Unable to authenticate with tor control port." +