+ added check for Tor to be ready before openhome works
* fixed not being able to stop Onionr when awaiting onboarding survey to be finished
This commit is contained in:
parent
3bb51a16e1
commit
353b2f1c63
5 changed files with 44 additions and 12 deletions
|
@ -13,7 +13,6 @@ import platform # For windows sigkill workaround
|
|||
|
||||
from onionrtypes import BooleanSuccessState
|
||||
import logger
|
||||
import filepaths
|
||||
from .. import getopenport
|
||||
from .. import watchdog
|
||||
from . import customtorrc
|
||||
|
@ -109,10 +108,6 @@ class NetController:
|
|||
logger.fatal('Got keyboard interrupt. Onionr will exit soon.', timestamp = False, terminal=True)
|
||||
return False
|
||||
|
||||
logger.info('Finished starting Tor.', terminal=True)
|
||||
|
||||
self.readyState = True
|
||||
|
||||
try:
|
||||
myID = open(self.dataDir + 'hs/hostname', 'r')
|
||||
self.myID = myID.read().replace('\n', '')
|
||||
|
@ -125,6 +120,10 @@ class NetController:
|
|||
|
||||
multiprocessing.Process(target=watchdog.watchdog,
|
||||
args=[os.getpid(), tor.pid]).start()
|
||||
|
||||
logger.info('Finished starting Tor.', terminal=True)
|
||||
|
||||
self.readyState = True
|
||||
return True
|
||||
|
||||
def killTor(self):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue