X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=blobdiff_plain;f=server.py;h=ae21e4adab5f21f7c7005da8f6a20fa0a293a19f;hp=4d347e7896909fe5991c2b5d01021ccc8152a38d;hb=cbd563a97c2fde6b523fc31d82daedaf4b1644ba;hpb=247a7b2add3cdffe0f60553a2b2a07db9ad4b576 diff --git a/server.py b/server.py index 4d347e7..ae21e4a 100755 --- a/server.py +++ b/server.py @@ -24,6 +24,7 @@ import threading import traceback import json +import os logging.basicConfig() @@ -57,7 +58,7 @@ def create_config(): config.set('server', 'ssl_certfile', '') config.set('server', 'ssl_keyfile', '') config.set('server', 'password', '') - config.set('server', 'irc', 'yes') + config.set('server', 'irc', 'no') config.set('server', 'irc_nick', '') config.set('server', 'coin', '') config.set('server', 'datadir', '') @@ -81,32 +82,21 @@ def create_config(): return config -def run_rpc_command(command, stratum_tcp_port): +def run_rpc_command(cmd, stratum_tcp_port): + import xmlrpclib + server = xmlrpclib.ServerProxy('http://localhost:8000') + func = getattr(server, cmd) try: - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect((host, int(stratum_tcp_port))) - except: - print "cannot connect to server." - return - - method = 'server.' + command - request = json.dumps({'id': 0, 'method': method, 'params': [password]}) - s.send(request + '\n') - msg = '' - while True: - o = s.recv(1024) - if not o: break - msg += o - if msg.find('\n') != -1: - break - s.close() - r = json.loads(msg).get('result') - - if command == 'info': + r = func() + except socket.error: + print "server not running" + sys.exit(1) + + if cmd == 'info': now = time.time() - print 'type address sub version time' + print 'type address sub version time' for item in r: - print '%4s %15s %3s %7s %.2f' % (item.get('name'), + print '%4s %21s %3s %7s %.2f' % (item.get('name'), item.get('address'), item.get('subscriptions'), item.get('version'), @@ -116,14 +106,39 @@ def run_rpc_command(command, stratum_tcp_port): print r +def cmd_info(): + return map(lambda s: {"time": s.time, + "name": s.name, + "address": s.address, + "version": s.version, + "subscriptions": len(s.subscriptions)}, + dispatcher.request_dispatcher.get_sessions()) + +def cmd_debug(): + try: + s = request['params'][1] + except: + s = None + + if s: + from guppy import hpy + h = hpy() + bp = dispatcher.request_dispatcher.processors['blockchain'] + try: + result = str(eval(s)) + except: + result = "error" + return result + + if __name__ == '__main__': config = create_config() password = config.get('server', 'password') host = config.get('server', 'host') - stratum_tcp_port = config.get('server', 'stratum_tcp_port') - stratum_http_port = config.get('server', 'stratum_http_port') - stratum_tcp_ssl_port = config.get('server', 'stratum_tcp_ssl_port') - stratum_http_ssl_port = config.get('server', 'stratum_http_ssl_port') + stratum_tcp_port = config.getint('server', 'stratum_tcp_port') + stratum_http_port = config.getint('server', 'stratum_http_port') + stratum_tcp_ssl_port = config.getint('server', 'stratum_tcp_ssl_port') + stratum_http_ssl_port = config.getint('server', 'stratum_http_ssl_port') ssl_certfile = config.get('server', 'ssl_certfile') ssl_keyfile = config.get('server', 'ssl_keyfile') @@ -134,13 +149,26 @@ if __name__ == '__main__': run_rpc_command(sys.argv[1], stratum_tcp_port) sys.exit(0) + try: + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.connect((host, stratum_tcp_port)) + s.close() + is_running = True + except: + is_running = False + + if is_running: + print "server already running" + sys.exit(1) + + from processor import Dispatcher, print_log from backends.irc import ServerProcessor + from transports.stratum_tcp import TcpServer + from transports.stratum_http import HttpServer backend_name = config.get('server', 'backend') - if backend_name == 'abe': - from backends.abe import BlockchainProcessor - elif backend_name == 'libbitcoin': + if backend_name == 'libbitcoin': from backends.libbitcoin import BlockchainProcessor elif backend_name == 'leveldb': from backends.bitcoind import BlockchainProcessor @@ -148,8 +176,7 @@ if __name__ == '__main__': print "Unknown backend '%s' specified\n" % backend_name sys.exit(1) - for i in xrange(5): - print "" + print "\n\n\n\n\n" print_log("Starting Electrum server on", host) # Create hub @@ -166,32 +193,41 @@ if __name__ == '__main__': transports = [] # Create various transports we need if stratum_tcp_port: - from transports.stratum_tcp import TcpServer - tcp_server = TcpServer(dispatcher, host, int(stratum_tcp_port), False, None, None) + tcp_server = TcpServer(dispatcher, host, stratum_tcp_port, False, None, None) transports.append(tcp_server) if stratum_tcp_ssl_port: - from transports.stratum_tcp import TcpServer - tcp_server = TcpServer(dispatcher, host, int(stratum_tcp_ssl_port), True, ssl_certfile, ssl_keyfile) + tcp_server = TcpServer(dispatcher, host, stratum_tcp_ssl_port, True, ssl_certfile, ssl_keyfile) transports.append(tcp_server) if stratum_http_port: - from transports.stratum_http import HttpServer - http_server = HttpServer(dispatcher, host, int(stratum_http_port), False, None, None) + http_server = HttpServer(dispatcher, host, stratum_http_port, False, None, None) transports.append(http_server) if stratum_http_ssl_port: - from transports.stratum_http import HttpServer - http_server = HttpServer(dispatcher, host, int(stratum_http_ssl_port), True, ssl_certfile, ssl_keyfile) + http_server = HttpServer(dispatcher, host, stratum_http_ssl_port, True, ssl_certfile, ssl_keyfile) transports.append(http_server) for server in transports: server.start() + + + from SimpleXMLRPCServer import SimpleXMLRPCServer + + + server = SimpleXMLRPCServer(('localhost',8000), allow_none=True, logRequests=False) + server.register_function(lambda: os.getpid(), 'getpid') + server.register_function(shared.stop, 'stop') + server.register_function(cmd_info, 'info') + server.register_function(cmd_debug, 'debug') + while not shared.stopped(): try: - time.sleep(1) + server.handle_request() except: shared.stop() + server_proc.join() + chain_proc.join() print_log("Electrum Server stopped")