Refactoring of daemon:
* gui and daemon are in the same process * commands that require network are sent to the daemon * open only one gui window per wallet
This commit is contained in:
ThomasV
@@ -11,5 +11,4 @@ import transaction
|
||||
from transaction import Transaction
|
||||
from plugins import BasePlugin
|
||||
from commands import Commands, known_commands
|
||||
from daemon import NetworkServer
|
||||
from network_proxy import NetworkProxy
|
||||
|
||||
@@ -724,7 +724,7 @@ def add_network_options(parser):
|
||||
from util import profiler
|
||||
|
||||
@profiler
|
||||
def get_parser(run_gui, run_daemon, run_cmdline):
|
||||
def get_parser():
|
||||
# parent parser, because set_default_subparser removes global options
|
||||
parent_parser = argparse.ArgumentParser('parent', add_help=False)
|
||||
group = parent_parser.add_argument_group('global options')
|
||||
@@ -740,7 +740,7 @@ def get_parser(run_gui, run_daemon, run_cmdline):
|
||||
# gui
|
||||
parser_gui = subparsers.add_parser('gui', parents=[parent_parser], description="Run Electrum's Graphical User Interface.", help="Run GUI (default)")
|
||||
parser_gui.add_argument("url", nargs='?', default=None, help="bitcoin URI (or bip70 file)")
|
||||
parser_gui.set_defaults(func=run_gui)
|
||||
#parser_gui.set_defaults(func=run_gui)
|
||||
parser_gui.add_argument("-g", "--gui", dest="gui", help="select graphical user interface", choices=['qt', 'lite', 'gtk', 'text', 'stdio', 'jsonrpc'])
|
||||
parser_gui.add_argument("-m", action="store_true", dest="hide_gui", default=False, help="hide GUI on startup")
|
||||
parser_gui.add_argument("-L", "--lang", dest="language", default=None, help="default language used in GUI")
|
||||
@@ -748,13 +748,13 @@ def get_parser(run_gui, run_daemon, run_cmdline):
|
||||
# daemon
|
||||
parser_daemon = subparsers.add_parser('daemon', parents=[parent_parser], help="Run Daemon")
|
||||
parser_daemon.add_argument("subcommand", choices=['start', 'status', 'stop'])
|
||||
parser_daemon.set_defaults(func=run_daemon)
|
||||
#parser_daemon.set_defaults(func=run_daemon)
|
||||
add_network_options(parser_daemon)
|
||||
# commands
|
||||
for cmdname in sorted(known_commands.keys()):
|
||||
cmd = known_commands[cmdname]
|
||||
p = subparsers.add_parser(cmdname, parents=[parent_parser], help=cmd.help, description=cmd.description)
|
||||
p.set_defaults(func=run_cmdline)
|
||||
#p.set_defaults(func=run_cmdline)
|
||||
if cmd.requires_password:
|
||||
p.add_argument("-W", "--password", dest="password", default=None, help="password")
|
||||
for optname, default in zip(cmd.options, cmd.defaults):
|
||||
|
||||
254
lib/daemon.py
254
lib/daemon.py
@@ -1,254 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
#
|
||||
# Electrum - lightweight Bitcoin client
|
||||
# Copyright (C) 2014 Thomas Voegtlin
|
||||
#
|
||||
# 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
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import socket
|
||||
import time
|
||||
import sys
|
||||
import os
|
||||
import threading
|
||||
import traceback
|
||||
import json
|
||||
import Queue
|
||||
from collections import defaultdict
|
||||
|
||||
import util
|
||||
from network import Network
|
||||
from util import print_error, print_stderr, parse_json
|
||||
from simple_config import SimpleConfig
|
||||
|
||||
DAEMON_SOCKET = 'daemon.sock'
|
||||
|
||||
|
||||
def do_start_daemon(config):
|
||||
import subprocess
|
||||
args = [sys.executable, __file__, config.path]
|
||||
logfile = open(os.path.join(config.path, 'daemon.log'),'w')
|
||||
p = subprocess.Popen(args, stderr=logfile, stdout=logfile, close_fds=(os.name=="posix"))
|
||||
print_stderr("starting daemon (PID %d)"%p.pid)
|
||||
|
||||
|
||||
|
||||
def get_daemon(config, start_daemon):
|
||||
import socket
|
||||
daemon_socket = os.path.join(config.path, DAEMON_SOCKET)
|
||||
daemon_started = False
|
||||
while True:
|
||||
try:
|
||||
s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
|
||||
s.connect(daemon_socket)
|
||||
return s
|
||||
except socket.error:
|
||||
if not start_daemon:
|
||||
return False
|
||||
elif not daemon_started:
|
||||
do_start_daemon(config)
|
||||
daemon_started = True
|
||||
else:
|
||||
time.sleep(0.1)
|
||||
except:
|
||||
# do not use daemon if AF_UNIX is not available (windows)
|
||||
return False
|
||||
|
||||
|
||||
|
||||
class ClientThread(util.DaemonThread):
|
||||
|
||||
def __init__(self, server, s):
|
||||
util.DaemonThread.__init__(self)
|
||||
self.server = server
|
||||
self.client_pipe = util.SocketPipe(s)
|
||||
self.response_queue = Queue.Queue()
|
||||
self.server.add_client(self)
|
||||
self.subscriptions = defaultdict(list)
|
||||
|
||||
def reading_thread(self):
|
||||
while self.is_running():
|
||||
try:
|
||||
request = self.client_pipe.get()
|
||||
except util.timeout:
|
||||
continue
|
||||
if request is None:
|
||||
self.running = False
|
||||
break
|
||||
method = request.get('method')
|
||||
params = request.get('params')
|
||||
if method == 'daemon.stop':
|
||||
self.server.stop()
|
||||
continue
|
||||
if method[-10:] == '.subscribe':
|
||||
self.subscriptions[method].append(params)
|
||||
self.server.send_request(self, request)
|
||||
|
||||
def run(self):
|
||||
threading.Thread(target=self.reading_thread).start()
|
||||
while self.is_running():
|
||||
try:
|
||||
response = self.response_queue.get(timeout=0.1)
|
||||
except Queue.Empty:
|
||||
continue
|
||||
try:
|
||||
self.client_pipe.send(response)
|
||||
except socket.error:
|
||||
self.running = False
|
||||
break
|
||||
self.server.remove_client(self)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
class NetworkServer(util.DaemonThread):
|
||||
|
||||
def __init__(self, config):
|
||||
util.DaemonThread.__init__(self)
|
||||
self.debug = False
|
||||
self.config = config
|
||||
self.pipe = util.QueuePipe()
|
||||
self.network = Network(self.pipe, config)
|
||||
self.lock = threading.RLock()
|
||||
# each GUI is a client of the daemon
|
||||
self.clients = []
|
||||
self.request_id = 0
|
||||
self.requests = {}
|
||||
|
||||
def add_client(self, client):
|
||||
for key in ['fee', 'status', 'banner', 'updated', 'servers', 'interfaces']:
|
||||
value = self.network.get_status_value(key)
|
||||
client.response_queue.put({'method':'network.status', 'params':[key, value]})
|
||||
with self.lock:
|
||||
self.clients.append(client)
|
||||
print_error("new client:", len(self.clients))
|
||||
|
||||
def remove_client(self, client):
|
||||
with self.lock:
|
||||
self.clients.remove(client)
|
||||
print_error("client quit:", len(self.clients))
|
||||
|
||||
def send_request(self, client, request):
|
||||
with self.lock:
|
||||
self.request_id += 1
|
||||
self.requests[self.request_id] = (request['id'], client)
|
||||
request['id'] = self.request_id
|
||||
if self.debug:
|
||||
print_error("-->", request)
|
||||
self.pipe.send(request)
|
||||
|
||||
def run(self):
|
||||
self.network.start()
|
||||
while self.is_running():
|
||||
try:
|
||||
response = self.pipe.get()
|
||||
except util.timeout:
|
||||
continue
|
||||
if self.debug:
|
||||
print_error("<--", response)
|
||||
response_id = response.get('id')
|
||||
if response_id:
|
||||
with self.lock:
|
||||
client_id, client = self.requests.pop(response_id)
|
||||
response['id'] = client_id
|
||||
client.response_queue.put(response)
|
||||
else:
|
||||
# notification
|
||||
m = response.get('method')
|
||||
v = response.get('params')
|
||||
for client in self.clients:
|
||||
if m == 'network.status' or v in client.subscriptions.get(m, []):
|
||||
client.response_queue.put(response)
|
||||
self.network.stop()
|
||||
print_error("server exiting")
|
||||
|
||||
|
||||
def daemon_loop(server):
|
||||
s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
|
||||
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
daemon_socket = os.path.join(server.config.path, DAEMON_SOCKET)
|
||||
if os.path.exists(daemon_socket):
|
||||
os.remove(daemon_socket)
|
||||
daemon_timeout = server.config.get('daemon_timeout', None)
|
||||
s.bind(daemon_socket)
|
||||
s.listen(5)
|
||||
s.settimeout(1)
|
||||
t = time.time()
|
||||
while server.running:
|
||||
try:
|
||||
connection, address = s.accept()
|
||||
except socket.timeout:
|
||||
if daemon_timeout is None:
|
||||
continue
|
||||
if not server.clients:
|
||||
if time.time() - t > daemon_timeout:
|
||||
print_error("Daemon timeout")
|
||||
break
|
||||
else:
|
||||
t = time.time()
|
||||
continue
|
||||
t = time.time()
|
||||
client = ClientThread(server, connection)
|
||||
client.start()
|
||||
server.stop()
|
||||
# sleep so that other threads can terminate cleanly
|
||||
time.sleep(0.5)
|
||||
print_error("Daemon exiting")
|
||||
|
||||
|
||||
|
||||
def check_www_dir(rdir):
|
||||
# rewrite index.html every time
|
||||
import urllib, urlparse, shutil, os
|
||||
if not os.path.exists(rdir):
|
||||
os.mkdir(rdir)
|
||||
index = os.path.join(rdir, 'index.html')
|
||||
src = os.path.join(os.path.dirname(__file__), 'www', 'index.html')
|
||||
shutil.copy(src, index)
|
||||
files = [
|
||||
"https://code.jquery.com/jquery-1.9.1.min.js",
|
||||
"https://raw.githubusercontent.com/davidshimjs/qrcodejs/master/qrcode.js",
|
||||
"https://code.jquery.com/ui/1.10.3/jquery-ui.js",
|
||||
"https://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css"
|
||||
]
|
||||
for URL in files:
|
||||
path = urlparse.urlsplit(URL).path
|
||||
filename = os.path.basename(path)
|
||||
path = os.path.join(rdir, filename)
|
||||
if not os.path.exists(path):
|
||||
print_error("downloading ", URL)
|
||||
urllib.urlretrieve(URL, path)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
import simple_config, util
|
||||
_config = {}
|
||||
if len(sys.argv) > 1:
|
||||
_config['electrum_path'] = sys.argv[1]
|
||||
config = simple_config.SimpleConfig(_config)
|
||||
util.set_verbosity(True)
|
||||
server = NetworkServer(config)
|
||||
server.start()
|
||||
if config.get('websocket_server'):
|
||||
import websockets
|
||||
websockets.WebSocketServer(config, server).start()
|
||||
if config.get('requests_dir'):
|
||||
check_www_dir(config.get('requests_dir'))
|
||||
|
||||
try:
|
||||
daemon_loop(server)
|
||||
except KeyboardInterrupt:
|
||||
print "Ctrl C - Stopping daemon"
|
||||
server.stop()
|
||||
sys.exit(1)
|
||||
Reference in New Issue
Block a user