Don't start the tor service with --no-incoming if there is a system one
This commit is contained in:
parent
0ba6a1d6d3
commit
54172c6972
|
@ -282,7 +282,7 @@ def main():
|
||||||
tor = None
|
tor = None
|
||||||
else:
|
else:
|
||||||
if not tor.start_tor_service():
|
if not tor.start_tor_service():
|
||||||
logging.warning('Failed to start tor service.')
|
logging.warning('The tor service has hot started.')
|
||||||
tor = None
|
tor = None
|
||||||
if not tor:
|
if not tor:
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -68,6 +68,8 @@ def start_tor_service():
|
||||||
init_msg_handler=logwrite)
|
init_msg_handler=logwrite)
|
||||||
except OSError:
|
except OSError:
|
||||||
if not attempt:
|
if not attempt:
|
||||||
|
if not shared.listen_for_connections:
|
||||||
|
return
|
||||||
try:
|
try:
|
||||||
stem.version.get_system_tor_version()
|
stem.version.get_system_tor_version()
|
||||||
except IOError:
|
except IOError:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user