make daemon usable with the GUI
This commit is contained in:
ThomasV
271
lib/daemon.py
271
lib/daemon.py
@@ -25,182 +25,29 @@ import traceback
|
||||
import json
|
||||
import Queue
|
||||
from network import Network
|
||||
from util import print_msg, print_stderr
|
||||
from util import print_error, print_stderr
|
||||
from simple_config import SimpleConfig
|
||||
|
||||
|
||||
"""
|
||||
The Network object is not aware of clients/subscribers
|
||||
It only does subscribe/unsubscribe to addresses
|
||||
Which client has wich address is managed by the daemon
|
||||
Network also reports status changes
|
||||
"""
|
||||
|
||||
DAEMON_PORT=8001
|
||||
|
||||
class NetworkProxy(threading.Thread):
|
||||
# connects to daemon
|
||||
# sends requests, runs callbacks
|
||||
|
||||
def __init__(self, config=None):
|
||||
if config is None:
|
||||
config = {} # Do not use mutables as default arguments!
|
||||
threading.Thread.__init__(self)
|
||||
self.daemon = True
|
||||
self.config = SimpleConfig(config) if type(config) == type({}) else config
|
||||
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
self.daemon_port = config.get('daemon_port', DAEMON_PORT)
|
||||
self.message_id = 0
|
||||
self.unanswered_requests = {}
|
||||
self.subscriptions = {}
|
||||
self.debug = False
|
||||
self.lock = threading.Lock()
|
||||
self.pending_transactions_for_notifications = []
|
||||
|
||||
|
||||
def start(self, start_daemon=False):
|
||||
daemon_started = False
|
||||
while True:
|
||||
try:
|
||||
self.socket.connect(('', self.daemon_port))
|
||||
threading.Thread.start(self)
|
||||
return True
|
||||
|
||||
except socket.error:
|
||||
if not start_daemon:
|
||||
return False
|
||||
|
||||
elif not daemon_started:
|
||||
print_stderr( "Starting daemon [%s]"%self.config.get('server'))
|
||||
daemon_started = True
|
||||
pid = os.fork()
|
||||
if (pid == 0): # The first child.
|
||||
os.chdir("/")
|
||||
os.setsid()
|
||||
os.umask(0)
|
||||
pid2 = os.fork()
|
||||
if (pid2 == 0): # Second child
|
||||
server = NetworkServer(self.config)
|
||||
try:
|
||||
server.main_loop()
|
||||
except KeyboardInterrupt:
|
||||
print "Ctrl C - Stopping server"
|
||||
sys.exit(1)
|
||||
sys.exit(0)
|
||||
else:
|
||||
time.sleep(0.1)
|
||||
|
||||
|
||||
|
||||
def parse_json(self, message):
|
||||
s = message.find('\n')
|
||||
if s==-1:
|
||||
return None, message
|
||||
j = json.loads( message[0:s] )
|
||||
return j, message[s+1:]
|
||||
|
||||
|
||||
def run(self):
|
||||
# read responses and trigger callbacks
|
||||
message = ''
|
||||
while True:
|
||||
try:
|
||||
data = self.socket.recv(1024)
|
||||
except:
|
||||
data = ''
|
||||
if not data:
|
||||
break
|
||||
|
||||
message += data
|
||||
while True:
|
||||
response, message = self.parse_json(message)
|
||||
if response is not None:
|
||||
self.process(response)
|
||||
else:
|
||||
break
|
||||
|
||||
print "NetworkProxy: exiting"
|
||||
|
||||
|
||||
def process(self, response):
|
||||
# runs callbacks
|
||||
if self.debug: print "<--", response
|
||||
|
||||
msg_id = response.get('id')
|
||||
with self.lock:
|
||||
method, params, callback = self.unanswered_requests.pop(msg_id)
|
||||
|
||||
result = response.get('result')
|
||||
callback(None, {'method':method, 'params':params, 'result':result, 'id':msg_id})
|
||||
|
||||
|
||||
def subscribe(self, messages, callback):
|
||||
# detect if it is a subscription
|
||||
with self.lock:
|
||||
if self.subscriptions.get(callback) is None:
|
||||
self.subscriptions[callback] = []
|
||||
for message in messages:
|
||||
if message not in self.subscriptions[callback]:
|
||||
self.subscriptions[callback].append(message)
|
||||
|
||||
self.send( messages, callback )
|
||||
|
||||
|
||||
def send(self, messages, callback):
|
||||
"""return the ids of the requests that we sent"""
|
||||
out = ''
|
||||
ids = []
|
||||
for m in messages:
|
||||
method, params = m
|
||||
request = json.dumps( { 'id':self.message_id, 'method':method, 'params':params } )
|
||||
self.unanswered_requests[self.message_id] = method, params, callback
|
||||
ids.append(self.message_id)
|
||||
if self.debug: print "-->", request
|
||||
self.message_id += 1
|
||||
out += request + '\n'
|
||||
while out:
|
||||
sent = self.socket.send( out )
|
||||
out = out[sent:]
|
||||
return ids
|
||||
|
||||
|
||||
def synchronous_get(self, requests, timeout=100000000):
|
||||
queue = Queue.Queue()
|
||||
ids = self.send(requests, lambda i,x: queue.put(x))
|
||||
id2 = ids[:]
|
||||
res = {}
|
||||
while ids:
|
||||
r = queue.get(True, timeout)
|
||||
_id = r.get('id')
|
||||
if _id in ids:
|
||||
ids.remove(_id)
|
||||
res[_id] = r.get('result')
|
||||
out = []
|
||||
for _id in id2:
|
||||
out.append(res[_id])
|
||||
return out
|
||||
|
||||
|
||||
def get_servers(self):
|
||||
return self.synchronous_get([('network.get_servers',[])])[0]
|
||||
|
||||
def get_header(self, height):
|
||||
return self.synchronous_get([('network.get_header',[height])])[0]
|
||||
|
||||
def get_local_height(self):
|
||||
return self.synchronous_get([('network.get_local_height',[])])[0]
|
||||
|
||||
def is_connected(self):
|
||||
return self.synchronous_get([('network.is_connected',[])])[0]
|
||||
|
||||
def is_up_to_date(self):
|
||||
return self.synchronous_get([('network.is_up_to_date',[])])[0]
|
||||
|
||||
def main_server(self):
|
||||
return self.synchronous_get([('network.main_server',[])])[0]
|
||||
|
||||
def stop(self):
|
||||
return self.synchronous_get([('daemon.shutdown',[])])[0]
|
||||
|
||||
|
||||
def trigger_callback(self, cb):
|
||||
pass
|
||||
|
||||
|
||||
|
||||
def parse_json(message):
|
||||
n = message.find('\n')
|
||||
if n==-1:
|
||||
return None, message
|
||||
try:
|
||||
j = json.loads( message[0:n] )
|
||||
except:
|
||||
j = None
|
||||
return j, message[n+1:]
|
||||
|
||||
|
||||
|
||||
@@ -208,12 +55,11 @@ class ClientThread(threading.Thread):
|
||||
# read messages from client (socket), and sends them to Network
|
||||
# responses are sent back on the same socket
|
||||
|
||||
def __init__(self, server, network, socket):
|
||||
def __init__(self, server, network, s):
|
||||
threading.Thread.__init__(self)
|
||||
self.server = server
|
||||
self.daemon = True
|
||||
self.s = socket
|
||||
self.s.settimeout(0.1)
|
||||
self.s = s
|
||||
self.network = network
|
||||
self.queue = Queue.Queue()
|
||||
self.unanswered_requests = {}
|
||||
@@ -221,6 +67,7 @@ class ClientThread(threading.Thread):
|
||||
|
||||
|
||||
def run(self):
|
||||
self.server.add_client(self)
|
||||
message = ''
|
||||
while True:
|
||||
self.send_responses()
|
||||
@@ -228,30 +75,25 @@ class ClientThread(threading.Thread):
|
||||
data = self.s.recv(1024)
|
||||
except socket.timeout:
|
||||
continue
|
||||
|
||||
except:
|
||||
data = ''
|
||||
if not data:
|
||||
break
|
||||
message += data
|
||||
|
||||
while True:
|
||||
cmd, message = self.parse_json(message)
|
||||
cmd, message = parse_json(message)
|
||||
if not cmd:
|
||||
break
|
||||
self.process(cmd)
|
||||
|
||||
#print "client thread terminating"
|
||||
self.server.remove_client(self)
|
||||
|
||||
|
||||
def parse_json(self, message):
|
||||
n = message.find('\n')
|
||||
if n==-1:
|
||||
return None, message
|
||||
j = json.loads( message[0:n] )
|
||||
return j, message[n+1:]
|
||||
|
||||
|
||||
def process(self, request):
|
||||
if self.debug: print "<--", request
|
||||
if self.debug:
|
||||
print_error("<--", request)
|
||||
method = request['method']
|
||||
params = request['params']
|
||||
_id = request['id']
|
||||
@@ -269,11 +111,6 @@ class ClientThread(threading.Thread):
|
||||
self.queue.put(out)
|
||||
return
|
||||
|
||||
if method == 'daemon.shutdown':
|
||||
self.server.running = False
|
||||
self.queue.put({'id':_id, 'result':True})
|
||||
return
|
||||
|
||||
def cb(i,r):
|
||||
_id = r.get('id')
|
||||
if _id is not None:
|
||||
@@ -295,8 +132,8 @@ class ClientThread(threading.Thread):
|
||||
while out:
|
||||
n = self.s.send(out)
|
||||
out = out[n:]
|
||||
if self.debug: print "-->", r
|
||||
|
||||
if self.debug:
|
||||
print_error("-->", r)
|
||||
|
||||
|
||||
|
||||
@@ -304,39 +141,61 @@ class NetworkServer:
|
||||
|
||||
def __init__(self, config):
|
||||
network = Network(config)
|
||||
if not network.start(wait=True):
|
||||
print_msg("Not connected, aborting.")
|
||||
sys.exit(1)
|
||||
network.start(wait=False)
|
||||
self.network = network
|
||||
self.server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
self.server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
self.daemon_port = config.get('daemon_port', DAEMON_PORT)
|
||||
self.server.bind(('', self.daemon_port))
|
||||
self.server.listen(5)
|
||||
self.server.settimeout(1)
|
||||
self.socket.bind(('', self.daemon_port))
|
||||
self.socket.listen(5)
|
||||
self.socket.settimeout(1)
|
||||
self.running = False
|
||||
self.timeout = config.get('daemon_timeout', 60)
|
||||
|
||||
#
|
||||
self.lock = threading.RLock()
|
||||
self.clients = []
|
||||
# need to know which client subscribed to which address
|
||||
#
|
||||
# report status
|
||||
self.network.status_callback = self.on_status
|
||||
|
||||
def add_client(self, client):
|
||||
with self.lock:
|
||||
self.clients.append(client)
|
||||
|
||||
def remove_client(self, client):
|
||||
with self.lock:
|
||||
self.clients.remove(client)
|
||||
print_error("client quit:", len(self.clients))
|
||||
|
||||
def on_status(self, status):
|
||||
for client in self.clients:
|
||||
client.queue.put({'method':'network.subscribe', 'status':status})
|
||||
|
||||
def main_loop(self):
|
||||
self.running = True
|
||||
t = time.time()
|
||||
while self.running:
|
||||
try:
|
||||
connection, address = self.server.accept()
|
||||
connection, address = self.socket.accept()
|
||||
except socket.timeout:
|
||||
if time.time() - t > self.timeout:
|
||||
break
|
||||
if not self.clients:
|
||||
if time.time() - t > self.timeout:
|
||||
break
|
||||
else:
|
||||
t = time.time()
|
||||
continue
|
||||
t = time.time()
|
||||
client = ClientThread(self, self.network, connection)
|
||||
client.start()
|
||||
print_error("daemon: timed out")
|
||||
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
import simple_config
|
||||
config = simple_config.SimpleConfig({'verbose':True, 'server':'ecdsa.net:50002:s'})
|
||||
import simple_config, util
|
||||
config = simple_config.SimpleConfig()
|
||||
util.set_verbosity(True)
|
||||
server = NetworkServer(config)
|
||||
try:
|
||||
server.main_loop()
|
||||
|
||||
Reference in New Issue
Block a user