dxs/onionr
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

print tor startup progress to term

Browse source
This commit is contained in:
Kevin Froman 2020-02-08 04:24:19 -06:00
parent 572e29f5d5
commit 982ac88a72
4 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/netcontroller/torcontrol/__init__.py
View file

@ -21,6 +21,7 @@ from . import gentorrc
from . import addbridges
from . import torbinary
from utils import identifyhome
from utils import box_print
"""
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -41,9 +42,7 @@ addbridges = addbridges.add_bridges
class NetController:
"""
This class handles hidden service setup on Tor
"""
"""Handle Tor daemon and onion service setup on Tor."""
def __init__(self, hsPort, apiServerIP='127.0.0.1'):
# set data dir
@ -90,6 +89,12 @@ class NetController:
# wait for tor to get to 100% bootstrap
try:
for line in iter(tor.stdout.readline, b''):
for word in ('bootstrapped', '%'):
if word not in line.decode().lower():
break
else:
if '100' not in line.decode():
logger.info(line.decode().strip(), terminal=True)
if 'bootstrapped 100' in line.decode().lower():
logger.info(line.decode())
break
@ -110,6 +115,7 @@ class NetController:
return False
logger.info('Finished starting Tor.', terminal=True)
logger.info('Connecting to Onionr soon', terminal=True)
self.readyState = True