X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=blobdiff_plain;f=backends%2Firc%2F__init__.py;h=46ec92146f9bf427fae491bf320f6e02f9333270;hp=28e60d9c32b82dbba0509274ffc837751b11b7dc;hb=3989b283341f5d456a5c6ffdd4e7fd00f57d0fcd;hpb=96733a4111d795b6a60dd650d690a9cfd3651efc

diff --git a/backends/irc/__init__.py b/backends/irc/__init__.py
index 28e60d9..46ec921 100644
--- a/backends/irc/__init__.py
+++ b/backends/irc/__init__.py
@@ -5,7 +5,7 @@ def random_string(N):
     return ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(N))
 
 from processor import Processor
-
+from version import VERSION
 
 class IrcThread(threading.Thread):
 
@@ -15,21 +15,43 @@ class IrcThread(threading.Thread):
         self.daemon = True
         self.stratum_tcp_port = config.get('server','stratum_tcp_port')
         self.stratum_http_port = config.get('server','stratum_http_port')
+        self.stratum_tcp_ssl_port = config.get('server','stratum_tcp_ssl_port')
+        self.stratum_http_ssl_port = config.get('server','stratum_http_ssl_port')
+        self.report_stratum_tcp_port = config.get('server','report_stratum_tcp_port')
+        self.report_stratum_http_port = config.get('server','report_stratum_http_port')
+        self.report_stratum_tcp_ssl_port = config.get('server','report_stratum_tcp_ssl_port')
+        self.report_stratum_http_ssl_port = config.get('server','report_stratum_http_ssl_port')
         self.peers = {}
         self.host = config.get('server','host')
+        self.report_host = config.get('server','report_host')
         self.nick = config.get('server', 'irc_nick')
+	if self.report_stratum_tcp_port: self.stratum_tcp_port = self.report_stratum_tcp_port
+	if self.report_stratum_http_port: self.stratum_http_port = self.report_stratum_http_port
+	if self.report_stratum_tcp_ssl_port: self.stratum_tcp_ssl_port = self.report_stratum_tcp_ssl_port
+	if self.report_stratum_http_ssl_port: self.stratum_http_ssl_port = self.report_stratum_http_ssl_port
+	if self.report_host: self.host = self.report_host
         if not self.nick: self.nick = random_string(10)
+        self.prepend = 'E_'
+        if config.get('server', 'coin') == 'litecoin':
+            self.prepend = 'EL_'
+        self.pruning = config.get('server', 'backend') == 'leveldb'
+        self.nick = self.prepend + self.nick
 
     def get_peers(self):
         return self.peers.values()
 
 
     def getname(self):
-        s = ''
+        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 + ' '
         return s
 
 
@@ -40,8 +62,13 @@ class IrcThread(threading.Thread):
             try:
                 s = socket.socket()
                 s.connect(('irc.freenode.net', 6667))
+            except:
+                time.sleep(10)
+                continue
+
+            try:
                 s.send('USER electrum 0 * :' + self.host + ' ' + ircname + '\n')
-                s.send('NICK E_' + self.nick + '\n')
+                s.send('NICK ' + self.nick + '\n')
                 s.send('JOIN #electrum\n')
                 sf = s.makefile('r', 0)
                 t = 0
@@ -55,7 +82,7 @@ class IrcThread(threading.Thread):
                     elif '353' in line: # answer to /names
                         k = line.index('353')
                         for item in line[k+1:]:
-                            if item[0:2] == 'E_':
+                            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
@@ -130,11 +157,11 @@ class ServerProcessor(Processor):
             result = self.get_peers()
 
         elif method == 'server.version':
-            result = 'ok'
+            result = VERSION
 
         elif method == 'server.stop':
             self.shared.stop()
-            result = 'ok'
+            result = 'stopping, please wait until all threads terminate.'
 
         elif method == 'server.info':
             result = map(lambda s: { "time":s.time, 
@@ -144,6 +171,10 @@ 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()