X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=backends%2Firc%2F__init__.py;h=cc3f3634c81dc1049454362bf57d65db4a323356;hb=aa444a8b7c461ca2df014f015dc64c6226fd976e;hp=489e31690f0e97309e13caef2adb31c00e2d5af9;hpb=1f28a49813efaaf2ff58d409710c205aefc2e82d;p=electrum-server.git

diff --git a/backends/irc/__init__.py b/backends/irc/__init__.py
index 489e316..cc3f363 100644
--- a/backends/irc/__init__.py
+++ b/backends/irc/__init__.py
@@ -83,44 +83,58 @@ 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()]})
+                        #self.processor.push_response({'method': 'server.peers', 'params': [self.get_peers()]})
                         s.send('NAMES #electrum\n')
                         t = time.time()
                         self.peers = {}
             except:
                 traceback.print_exc(file=sys.stdout)
             finally:
-                sf.close()
                 s.close()
 
         print_log("quitting IRC")
@@ -150,19 +164,20 @@ class ServerProcessor(Processor):
             self.irc.start()
         Processor.run(self)
 
-    def process(self, request):
+    def process(self, session, request):
         method = request['method']
         params = request['params']
         result = None
 
-        if method in ['server.stop', 'server.info']:
+        if method in ['server.stop', 'server.info', 'server.debug']:
             try:
                 password = request['params'][0]
             except:
                 password = None
 
             if password != self.password:
-                self.push_response({'id': request['id'],
+                self.push_response(session, 
+                                   {'id': request['id'],
                                     'result': None,
                                     'error': 'incorrect password'})
                 return
@@ -188,16 +203,22 @@ class ServerProcessor(Processor):
                                     "subscriptions": len(s.subscriptions)},
                          self.dispatcher.request_dispatcher.get_sessions())
 
-        elif method == 'server.cache':
-            p = self.dispatcher.request_dispatcher.processors['blockchain']
-            result = len(repr(p.store.tx_cache))
-
-        elif method == 'server.load':
-            p = self.dispatcher.request_dispatcher.processors['blockchain']
-            result = p.queue.qsize()
-
+        elif method == 'server.debug':
+            try:
+                s = request['params'][1]
+            except:
+                s = None
+
+            if s:
+                from guppy import hpy
+                h = hpy()
+                bp = self.dispatcher.request_dispatcher.processors['blockchain']
+                try:
+                    result = str(eval(s))
+                except:
+                    result = "error"
         else:
-            print_log("unknown method", request)
+            print_log("unknown method", method)
 
         if result != '':
-            self.push_response({'id': request['id'], 'result': result})
+            self.push_response(session, {'id': request['id'], 'result': result})