From 815696485f9908307162dae028b44a5458647882 Mon Sep 17 00:00:00 2001
From: Job Evers-Meltzer <jobevers@users.noreply.github.com>
Date: Wed, 2 Nov 2016 07:23:37 -0500
Subject: [PATCH] More robustly stop the reactor
Was getting a "cannot stop a reactor that isn't running error"
when playing around with error handling on startup.
Following the suggestion from http://stackoverflow.com/a/36738480
it seems to work better
---
lbrynet/lbrynet_daemon/Daemon.py | 10 ++++++----
lbrynet/lbrynet_daemon/DaemonControl.py | 4 ++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py
index 58aef6e17..49ae9aa4b 100644
--- a/lbrynet/lbrynet_daemon/Daemon.py
+++ b/lbrynet/lbrynet_daemon/Daemon.py
@@ -225,10 +225,12 @@ class Daemon(AuthJSONRPCServer):
AuthJSONRPCServer.__init__(self, lbrynet_settings.use_auth_http)
reactor.addSystemEventTrigger('before', 'shutdown', self._shutdown)
- self.allowed_during_startup = ['is_running', 'is_first_run',
- 'get_time_behind_blockchain', 'stop',
- 'daemon_status', 'get_start_notice',
- 'version', 'get_search_servers']
+ self.allowed_during_startup = [
+ 'is_running', 'is_first_run',
+ 'get_time_behind_blockchain', 'stop',
+ 'daemon_status', 'get_start_notice',
+ 'version', 'get_search_servers'
+ ]
last_version = {'last_version': {'lbrynet': lbrynet_version, 'lbryum': lbryum_version}}
lbrynet_settings.update(last_version)
self.db_dir = lbrynet_settings.data_dir
diff --git a/lbrynet/lbrynet_daemon/DaemonControl.py b/lbrynet/lbrynet_daemon/DaemonControl.py
index 58b003e77..0c3575ab1 100644
--- a/lbrynet/lbrynet_daemon/DaemonControl.py
+++ b/lbrynet/lbrynet_daemon/DaemonControl.py
@@ -121,7 +121,7 @@ def update_settings_from_args(args):
def log_and_kill(failure):
log_support.failure(failure, log, 'Failed to startup: %s')
- reactor.stop()
+ reactor.callFromThread(reactor.stop)
def start_server_and_listen(launchui, use_auth):
@@ -133,13 +133,13 @@ def start_server_and_listen(launchui, use_auth):
kwargs: passed along to `DaemonServer().start()`
"""
lbry = DaemonServer()
-
d = lbry.start()
d.addCallback(lambda _: listen(lbry, use_auth))
if launchui:
d.addCallback(lambda _: webbrowser.open(settings.UI_ADDRESS))
d.addErrback(log_and_kill)
+
def listen(lbry, use_auth):
site_base = get_site_base(use_auth, lbry.root)
lbrynet_server = server.Site(site_base)