tIn 'daemon start', do not return until the daemon can be reached - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit ed086934e5f57745580628a5706a6a40856c695a
DIR parent 5ec1db4d51f0abf0e4327b6471b00dda6096572c
HTML Author: ThomasV <thomasv@electrum.org>
Date: Fri, 30 Aug 2019 15:15:30 +0200
In 'daemon start', do not return until the daemon can be reached
Diffstat:
M run_electrum | 37 ++++++++++++++++++++++++++-----
1 file changed, 32 insertions(+), 5 deletions(-)
---
DIR diff --git a/run_electrum b/run_electrum
t@@ -24,6 +24,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
import os
+import time
import sys
import warnings
import asyncio
t@@ -273,6 +274,16 @@ def sys_exit(i):
loop_thread.join(timeout=1)
sys.exit(i)
+def can_ping_daemon(config):
+ try:
+ daemon.request(config, 'ping')
+ return True
+ except daemon.DaemonNotRunning:
+ return False
+ except BaseException as e:
+ print_stderr(e)
+ return False
+
if __name__ == '__main__':
# The hook will only be used in the Qt GUI right now
util.setup_thread_excepthook()
t@@ -348,6 +359,8 @@ if __name__ == '__main__':
# todo: defer this to gui
config = SimpleConfig(config_options)
+ # this sets rpc_password as side effect
+ daemon.get_rpc_credentials(config)
cmdname = config.get('cmd')
subcommand = config.get('subcommand')
t@@ -361,12 +374,28 @@ if __name__ == '__main__':
elif config.get('lightning') and not config.get('reckless'):
raise Exception('lightning branch not available on mainnet')
+ loop, stop_loop, loop_thread = create_and_start_event_loop()
+
if cmdname == 'daemon' and subcommand == 'start':
- # fork before creating the asyncio event loop
+ if can_ping_daemon(config):
+ print_stderr('daemon already running')
+ sys_exit(1)
+ loop.call_soon_threadsafe(stop_loop.set_result, 1)
+ loop_thread.join(timeout=1)
+ # we must fork before creating the asyncio event loop,
+ # see https://bugs.python.org/issue21998
pid = os.fork()
+ loop, stop_loop, loop_thread = create_and_start_event_loop()
if pid:
- print_stderr("starting daemon (PID %d)" % pid)
- sys.exit(0)
+ for i in range(10):
+ if can_ping_daemon(config):
+ break
+ time.sleep(0.5)
+ else:
+ print_stderr("Could not contact daemon, giving up")
+ sys_exit(1)
+ print_stderr("Daemon started (PID %d)" % pid)
+ sys_exit(0)
else:
# redirect standard file descriptors
sys.stdout.flush()
t@@ -378,8 +407,6 @@ if __name__ == '__main__':
os.dup2(so.fileno(), sys.stdout.fileno())
os.dup2(se.fileno(), sys.stderr.fileno())
- loop, stop_loop, loop_thread = create_and_start_event_loop()
-
if cmdname == 'gui':
configure_logging(config)
fd = daemon.get_file_descriptor(config)