X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=blobdiff_plain;f=server.py;h=d41bcf35e4af8362455304eb527a67527b60ae5b;hp=b727b653170f75ae88ef6e6eca89b72dafb54af5;hb=240db7c28d2e6a0d0078c42f81b2b110615e88c6;hpb=5c10a2976f94f8c2deee76cff2a1f2777dbd2d25

diff --git a/server.py b/server.py
index b727b65..d41bcf3 100755
--- a/server.py
+++ b/server.py
@@ -15,10 +15,16 @@
 # License along with this program.  If not, see
 # <http://www.gnu.org/licenses/agpl.html>.
 
-import time, sys, traceback, threading
 import ConfigParser
-
 import logging
+import socket
+import sys
+import time
+import threading
+import traceback
+
+import json
+
 logging.basicConfig()
 
 if sys.maxsize <= 2**32:
@@ -32,26 +38,35 @@ def attempt_read_config(config, filename):
     except IOError:
         pass
 
+
 def create_config():
     config = ConfigParser.ConfigParser()
     # set some defaults, which will be overwritten by the config file
     config.add_section('server')
     config.set('server', 'banner', 'Welcome to Electrum!')
     config.set('server', 'host', 'localhost')
+    config.set('server', 'report_host', '')
     config.set('server', 'stratum_tcp_port', '50001')
     config.set('server', 'stratum_http_port', '8081')
-    config.set('server', 'stratum_tcp_ssl_port', '50002')
-    config.set('server', 'stratum_http_ssl_port', '8082')
+    config.set('server', 'stratum_tcp_ssl_port', '')
+    config.set('server', 'stratum_http_ssl_port', '')
+    config.set('server', 'report_stratum_tcp_port', '')
+    config.set('server', 'report_stratum_http_port', '')
+    config.set('server', 'report_stratum_tcp_ssl_port', '')
+    config.set('server', 'report_stratum_http_ssl_port', '')
+    config.set('server', 'ssl_certfile', '')
+    config.set('server', 'ssl_keyfile', '')
     config.set('server', 'password', '')
     config.set('server', 'irc', 'yes')
     config.set('server', 'irc_nick', '')
     config.set('server', 'coin', '')
     config.set('server', 'datadir', '')
-    config.add_section('database')
-    config.set('database', 'type', 'psycopg2')
-    config.set('database', 'database', 'abe')
-    config.set('database', 'limit', '1000')
-    config.set('server', 'backend', 'abe')
+
+    # use leveldb as default
+    config.set('server', 'backend', 'leveldb')
+    config.add_section('leveldb')
+    config.set('leveldb', 'path', '/dev/shm/electrum_db')
+    config.set('leveldb', 'pruning_limit', '100')
 
     for path in ('/etc/', ''):
         filename = path + 'electrum.conf'
@@ -59,39 +74,52 @@ def create_config():
 
     try:
         with open('/etc/electrum.banner', 'r') as f:
-            config.set('server','banner', f.read())
+            config.set('server', 'banner', f.read())
     except IOError:
         pass
 
     return config
 
+
 def run_rpc_command(command, stratum_tcp_port):
-    import socket, json
-    s = socket.socket( socket.AF_INET, socket.SOCK_STREAM )
-    s.connect(( host, int(stratum_tcp_port )))
+    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] } )
+    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
+        if msg.find('\n') != -1:
+            break
     s.close()
     r = json.loads(msg).get('result')
 
-    if command == 'info': 
+    if command == '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'), 
-                                                  item.get('address'), 
-                                                  item.get('subscriptions'), 
-                                                  item.get('version'), 
-                                                  (now - item.get('time')) )
+            print '%4s   %21s   %3s  %7s  %.2f' % (item.get('name'),
+                                                   item.get('address'),
+                                                   item.get('subscriptions'),
+                                                   item.get('version'),
+                                                   (now - item.get('time')),
+                                                   )
     else:
         print r
 
+
 if __name__ == '__main__':
     config = create_config()
     password = config.get('server', 'password')
@@ -103,30 +131,31 @@ if __name__ == '__main__':
     ssl_certfile = config.get('server', 'ssl_certfile')
     ssl_keyfile = config.get('server', 'ssl_keyfile')
 
-    if stratum_tcp_ssl_port or stratum_http_ssl_port: assert ssl_certfile and ssl_keyfile 
+    if stratum_tcp_ssl_port or stratum_http_ssl_port:
+        assert ssl_certfile and ssl_keyfile
 
     if len(sys.argv) > 1:
         run_rpc_command(sys.argv[1], stratum_tcp_port)
         sys.exit(0)
 
-    from processor import Dispatcher
+    from processor import Dispatcher, print_log
     from backends.irc import ServerProcessor
 
     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 == 'bitcoind':
+    elif backend_name == 'leveldb':
         from backends.bitcoind import BlockchainProcessor
     else:
         print "Unknown backend '%s' specified\n" % backend_name
         sys.exit(1)
 
-    print "\n\n\n\nStarting Electrum server on", host
+    for i in xrange(5):
+        print ""
+    print_log("Starting Electrum server on", host)
 
     # Create hub
-    dispatcher = Dispatcher()
+    dispatcher = Dispatcher(config)
     shared = dispatcher.shared
 
     # Create and register processors
@@ -167,5 +196,4 @@ if __name__ == '__main__':
         except:
             shared.stop()
 
-    print "Electrum Server stopped"
-
+    print_log("Electrum Server stopped")