cache commands

[electrum-server.git] / server.py

diff --git a/server.py b/server.py
index 69bf27d..9e5a29b 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -37,11 +37,11 @@ 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', 'ecdsa.org')
+config.set('server', 'host', 'localhost')
 config.set('server', 'port', 50000)
 config.set('server', 'password', '')
 config.set('server', 'irc', 'yes')
-config.set('server', 'cache', 'yes') 
+config.set('server', 'cache', 'no') 
 config.set('server', 'ircname', 'Electrum server')
 config.add_section('database')
 config.set('database', 'type', 'psycopg2')
@@ -59,11 +59,9 @@ block_number = -1
 sessions = {}
 sessions_last_time = {}
 dblock = thread.allocate_lock()
-
 peer_list = {}
 
 
-
 class MyStore(Datastore_class):
 
     def import_tx(self, tx, is_coinbase):
@@ -76,14 +74,14 @@ class MyStore(Datastore_class):
             _hash = store.binout(row[6])
             address = hash_to_address(chr(0), _hash)
             if self.tx_cache.has_key(address):
-                #print "cache: popping", address, self.ismempool
+                print "cache: invalidating", address, self.ismempool
                 self.tx_cache.pop(address)
         outrows = self.get_tx_outputs(txid, False)
         for row in outrows:
             _hash = store.binout(row[6])
             address = hash_to_address(chr(0), _hash)
             if self.tx_cache.has_key(address):
-                #print "cache: popping", address, self.ismempool
+                print "cache: invalidating", address, self.ismempool
                 self.tx_cache.pop(address)
 
     def safe_sql(self,sql, params=(), lock=True):
@@ -245,11 +243,15 @@ class MyStore(Datastore_class):
         rows = []
         rows += self.get_address_in_rows_memorypool( dbhash )
         rows += self.get_address_out_rows_memorypool( dbhash )
+        address_has_mempool = False
+
         for row in rows:
             is_in, tx_hash, tx_id, pos, value = row
             tx_hash = self.hashout_hex(tx_hash)
             if tx_hash in known_tx:
                 continue
+
+            address_has_mempool = True
             #print "mempool", tx_hash
             txpoint = {
                     "nTime":    0,
@@ -297,7 +299,7 @@ class MyStore(Datastore_class):
                     if not row[4]: txpoint['raw_scriptPubKey'] = row[1]
 
         # cache result
-        if config.get('server','cache') == 'yes':
+        if config.get('server','cache') == 'yes' and not address_has_mempool:
             self.tx_cache[addr] = txpoints
         
         return txpoints
@@ -343,6 +345,8 @@ def client_thread(ipaddr,conn):
         while 1:
             d = conn.recv(1024)
             msg += d
+            if not d: 
+                break
             if d[-1]=='#':
                 break
 
@@ -366,7 +370,7 @@ def client_thread(ipaddr,conn):
                 conn.close()
                 return
 
-            print time.asctime(), "session", ipaddr, session_id, addresses[0], len(addresses)
+            print time.asctime(), "session", ipaddr, session_id, addresses[0] if addresses else addresses, len(addresses)
 
             sessions[session_id] = {}
             for a in addresses:
@@ -377,19 +381,27 @@ def client_thread(ipaddr,conn):
         elif cmd=='poll': 
             session_id = data
             addresses = sessions.get(session_id)
-            if not addresses:
-                print "session not found", ipaddr
+            if addresses is None:
+                print time.asctime(), " Session not found", session_id, ipaddr
                 out = repr( (-1, {}))
             else:
+                t1 = time.time()
                 sessions_last_time[session_id] = time.time()
                 ret = {}
+                k = 0
                 for addr in addresses:
+                    if store.tx_cache.get( addr ) is not None: k += 1
                     status = store.get_status( addr )
-                    last_status = sessions[session_id].get( addr )
+                    last_status = addresses.get( addr )
                     if last_status != status:
-                        sessions[session_id][addr] = status
+                        addresses[addr] = status
                         ret[addr] = status
+                if ret:
+                    sessions[session_id] = addresses
                 out = repr( (block_number, ret ) )
+                t2 = time.time() - t1 
+                if t2 > 10:
+                    print "high load:", session_id, "%d/%d"%(k,len(addresses)), t2
 
         elif cmd == 'h': 
             # history
@@ -405,6 +417,27 @@ def client_thread(ipaddr,conn):
         elif cmd =='tx':        
             out = send_tx(data)
 
+        elif cmd =='clear_cache':
+            if config.get('server','password') == data:
+                self.tx_cache = {}
+                out = 'ok'
+            else:
+                out = 'wrong password'
+
+        elif cmd =='get_cache':
+            try:
+                pw, addr = data
+            except:
+                addr = None
+            if addr:
+                if config.get('server','password') == pw:
+                    out = store.tx_cache.get(addr)
+                    out = repr(out)
+                else:
+                    out = 'wrong password'
+            else:
+                out = "error: "+ repr(data)
+
         elif cmd == 'stop':
             global stopping
             if config.get('server','password') == data:
@@ -466,8 +499,8 @@ def clean_session_thread():
         time.sleep(30)
         t = time.time()
         for k,t0 in sessions_last_time.items():
-            if t - t0 > 60:
-                print "lost session",k
+            if t - t0 > 5*60:
+                print time.asctime(), "lost session",k
                 sessions.pop(k)
                 sessions_last_time.pop(k)
             
@@ -503,7 +536,7 @@ def irc_thread():
                     name = line[k+6]
                     host = line[k+9]
                     peer_list[name] = (ip,host)
-                elif time.time() - t > 5*60:
+                if time.time() - t > 5*60:
                     s.send('NAMES #electrum\n')
                     t = time.time()
                     peer_list = {}
@@ -527,6 +560,14 @@ if __name__ == '__main__':
             request = "('peers','')#"
         elif cmd == 'stop':
             request = "('stop','%s')#"%config.get('server','password')
+        elif cmd == 'clear_cache':
+            request = "('clear_cache','%s')#"%config.get('server','password')
+        elif cmd == 'get_cache':
+            request = "('get_cache',('%s','%s'))#"%(config.get('server','password'),sys.argv[2])
+        elif cmd == 'h':
+            request = "('h','%s')#"%sys.argv[2]
+        elif cmd == 'b':
+            request = "('b','')#"
 
         s = socket.socket( socket.AF_INET, socket.SOCK_STREAM)
         s.connect((config.get('server','host'), config.getint('server','port')))
@@ -542,6 +583,8 @@ if __name__ == '__main__':
 
 
     print "starting Electrum server"
+    print "cache:", config.get('server', 'cache')
+
     conf = DataStore.CONFIG_DEFAULTS
     args, argv = readconf.parse_argv( [], conf)
     args.dbtype= config.get('database','type')