X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=blobdiff_plain;f=backends%2Firc%2F__init__.py;h=0ec2a8bd7853d6f1f9803a40bd6c5f66bc700f70;hp=1efa97e1cebf0f11b41f56d16ee3c25af2d21f20;hb=582484158823da1777d2a348165d3334bf0d2685;hpb=a5ee6ee874d534225b59bf2d5efc3c7785c126ab

diff --git a/backends/irc/__init__.py b/backends/irc/__init__.py
index 1efa97e..0ec2a8b 100644
--- a/backends/irc/__init__.py
+++ b/backends/irc/__init__.py
@@ -44,6 +44,8 @@ class IrcThread(threading.Thread):
         if config.get('server', 'coin') == 'litecoin':
             self.prepend = 'EL_'
         self.pruning = config.get('server', 'backend') == 'leveldb'
+        if self.pruning:
+            self.pruning_limit = config.get('leveldb', 'pruning_limit')
         self.nick = self.prepend + self.nick
 
     def get_peers(self):
@@ -52,15 +54,20 @@ class IrcThread(threading.Thread):
     def getname(self):
         s = 'v' + VERSION + ' '
         if self.pruning:
-            s += 'p '
-        if self.stratum_tcp_port:
-            s += 't' + self.stratum_tcp_port + ' '
-        if self.stratum_http_port:
-            s += 'h' + self.stratum_http_port + ' '
-        if self.stratum_tcp_port:
-            s += 's' + self.stratum_tcp_ssl_port + ' '
-        if self.stratum_http_port:
-            s += 'g' + self.stratum_http_ssl_port + ' '
+            s += 'p' + self.pruning_limit + ' '
+
+        def add_port(letter, number):
+            DEFAULT_PORTS = {'t':'50001', 's':'50002', 'h':'8081', 'g':'8082'}
+            if not number: return ''
+            if DEFAULT_PORTS[letter] == number:
+                return letter + ' '
+            else:
+                return letter + number + ' '
+
+        s += add_port('t',self.stratum_tcp_port)
+        s += add_port('h',self.stratum_http_port)
+        s += add_port('s',self.stratum_tcp_ssl_port)
+        s += add_port('g',self.stratum_http_ssl_port)
         return s
 
     def run(self):
@@ -76,35 +83,50 @@ class IrcThread(threading.Thread):
                 time.sleep(10)
                 continue
 
+            self.message = ''
             try:
                 s.send('USER electrum 0 * :' + self.host + ' ' + ircname + '\n')
                 s.send('NICK ' + self.nick + '\n')
                 s.send('JOIN #electrum\n')
-                sf = s.makefile('r', 0)
                 t = 0
                 while not self.processor.shared.stopped():
-                    line = sf.readline().rstrip('\r\n').split()
-                    if not line:
-                        continue
-                    if line[0] == 'PING':
-                        s.send('PONG ' + line[1] + '\n')
-                    elif '353' in line:  # answer to /names
-                        k = line.index('353')
-                        for item in line[k+1:]:
-                            if item.startswith(self.prepend):
-                                s.send('WHO %s\n' % item)
-                    elif '352' in line:  # answer to /who
-                        # warning: this is a horrible hack which apparently works
-                        k = line.index('352')
-                        try:
-                            ip = socket.gethostbyname(line[k+4])
-                        except:
-                            print_log("gethostbyname error", line[k+4])
+                    try:
+                        data = s.recv(2048)
+                    except:
+                        print_log( "irc: socket error" )
+                        time.sleep(1)
+                        break
+
+                    self.message += data
+
+                    while self.message.find('\n') != -1:
+                        pos = self.message.find('\n')
+                        line = self.message[0:pos]
+                        self.message = self.message[pos+1:]
+                        line = line.strip('\r')
+                        if not line:
                             continue
-                        name = line[k+6]
-                        host = line[k+9]
-                        ports = line[k+10:]
-                        self.peers[name] = (ip, host, ports)
+                        line = line.split()
+                        if line[0] == 'PING':
+                            s.send('PONG ' + line[1] + '\n')
+                        elif '353' in line:  # answer to /names
+                            k = line.index('353')
+                            for item in line[k+1:]:
+                                if item.startswith(self.prepend):
+                                    s.send('WHO %s\n' % item)
+                        elif '352' in line:  # answer to /who
+                            # warning: this is a horrible hack which apparently works
+                            k = line.index('352')
+                            try:
+                                ip = socket.gethostbyname(line[k+4])
+                            except:
+                                print_log("gethostbyname error", line[k+4])
+                                continue
+                            name = line[k+6]
+                            host = line[k+9]
+                            ports = line[k+10:]
+                            self.peers[name] = (ip, host, ports)
+
                     if time.time() - t > 5*60:
                         self.processor.push_response({'method': 'server.peers', 'params': [self.get_peers()]})
                         s.send('NAMES #electrum\n')
@@ -113,7 +135,6 @@ class IrcThread(threading.Thread):
             except:
                 traceback.print_exc(file=sys.stdout)
             finally:
-                sf.close()
                 s.close()
 
         print_log("quitting IRC")
@@ -148,7 +169,7 @@ class ServerProcessor(Processor):
         params = request['params']
         result = None
 
-        if method in ['server.stop', 'server.info']:
+        if method in ['server.stop', 'server.info', 'server.heapy']:
             try:
                 password = request['params'][0]
             except:
@@ -183,12 +204,25 @@ class ServerProcessor(Processor):
 
         elif method == 'server.cache':
             p = self.dispatcher.request_dispatcher.processors['blockchain']
-            result = len(repr(p.store.tx_cache))
+            result = len(repr(p.history_cache))
 
         elif method == 'server.load':
             p = self.dispatcher.request_dispatcher.processors['blockchain']
             result = p.queue.qsize()
 
+        elif method == 'server.heapy':
+            try:
+                s = request['params'][1]
+            except:
+                s = None
+
+            if s:
+                from guppy import hpy
+                h = hpy()
+                try:
+                    result = str(eval(s))
+                except:
+                    result = "error"
         else:
             print_log("unknown method", request)