X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=blobdiff_plain;f=server.py;h=ae21e4adab5f21f7c7005da8f6a20fa0a293a19f;hp=3b3dfc022b0c3b61c68896f93d7a02d5c7ad4bb9;hb=cbd563a97c2fde6b523fc31d82daedaf4b1644ba;hpb=4427d6d0a105e6925bb0e54fbc1638c3c4164a93

diff --git a/server.py b/server.py
index 3b3dfc0..ae21e4a 100755
--- a/server.py
+++ b/server.py
@@ -24,6 +24,7 @@ import threading
 import traceback
 
 import json
+import os
 
 logging.basicConfig()
 
@@ -81,32 +82,17 @@ 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, stratum_tcp_port))
-    except:
-        print "cannot connect to server."
-        return
+        r = func()
+    except socket.error:
+        print "server not running"
+        sys.exit(1)
 
-    method = 'server.' + command
-    params = [password]
-    if len(sys.argv) > 2:
-        params.append(sys.argv[2])
-    
-    request = json.dumps({'id': 0, 'method': method, 'params': params})
-    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':
+    if cmd == 'info':
         now = time.time()
         print 'type           address         sub  version  time'
         for item in r:
@@ -120,6 +106,31 @@ 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')
@@ -200,9 +211,20 @@ if __name__ == '__main__':
     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()