Merge pull request #156 from Mirobit/master

Removal of remaining http references

setup.py

@@ -19,8 +19,7 @@
         'electrumserver.processor',
         'electrumserver.version',
         'electrumserver.ircthread',
-        'electrumserver.stratum_tcp',
-        'electrumserver.stratum_http'
+        'electrumserver.stratum_tcp'
     ],
     description="Bitcoin Electrum Server",
     author="Thomas Voegtlin",

src/ircthread.py

@@ -42,25 +42,17 @@ def __init__(self, processor, config):
         self.daemon = True
         options = dict(config.items('server'))
         self.stratum_tcp_port = options.get('stratum_tcp_port')
-        self.stratum_http_port = options.get('stratum_http_port')
         self.stratum_tcp_ssl_port = options.get('stratum_tcp_ssl_port')
-        self.stratum_http_ssl_port = options.get('stratum_http_ssl_port')
         self.report_stratum_tcp_port = options.get('report_stratum_tcp_port')
-        self.report_stratum_http_port = options.get('report_stratum_http_port')
         self.report_stratum_tcp_ssl_port = options.get('report_stratum_tcp_ssl_port')
-        self.report_stratum_http_ssl_port = options.get('report_stratum_http_ssl_port')
         self.irc_bind_ip = options.get('irc_bind_ip')
         self.host = options.get('host')
         self.report_host = options.get('report_host')
         self.nick = options.get('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:
@@ -77,17 +69,15 @@ def getname(self):
             s += 'p' + self.pruning_limit + ' '
 
         def add_port(letter, number):
-            DEFAULT_PORTS = {'t':'50001', 's':'50002', 'h':'8081', 'g':'8082'}
+            DEFAULT_PORTS = {'t':'50001', 's':'50002'}
             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 start(self, queue):

src/processor.py

@@ -161,7 +161,6 @@ def run(self):
                 self.do_dispatch(session, request)
             except:
                 logger.error('dispatch',exc_info=True)
-            self.collect_garbage()
 
         self.stop()
 
@@ -211,16 +210,6 @@ def remove_session(self, session):
         with self.lock:
             del self.sessions[key]
 
-    def collect_garbage(self):
-        # only for HTTP sessions.
-        now = time.time()
-        if time.time() - self.lastgc < 60.0:
-            return
-        self.lastgc = now
-        for session in self.sessions.values():
-            if session.name == "HTTP" and (now - session.time) > session.timeout:
-                session.stop()
-
 
 class Session: