From: ThomasV <thomasv@gitorious>
Date: Mon, 26 Mar 2012 09:42:11 +0000 (+0400)
Subject: don't close session twice; get connection inside try statement
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=4792b79d87e45deee06c806f390fbfbed9c95da5

don't close session twice; get connection inside try statement
---

diff --git a/server.py b/server.py
index 666d5d4..07b1566 100755
--- a/server.py
+++ b/server.py
@@ -396,6 +396,7 @@ class AbeProcessor(stratum.Processor):
         message_id = request['id']
         method = request['method']
         params = request.get('params',[])
+        #print request
 
         result = ''
         if method == 'numblocks.subscribe':
diff --git a/stratum.py b/stratum.py
index 9d063f2..d91b7d1 100644
--- a/stratum.py
+++ b/stratum.py
@@ -70,6 +70,7 @@ class Session:
         self.lock = threading.Lock()
         self.numblocks_sub = None
         self.addresses_sub = {}
+        print "new session", address
 
     def stop(self):
         self._connection.close()
@@ -110,8 +111,8 @@ class TcpResponder(threading.Thread):
             # Possible race condition here by having session
             # close connection?
             # I assume Python connections are thread safe interfaces
-            connection = session.connection()
             try:
+                connection = session.connection()
                 connection.send(raw_response + "\n")
             except:
                 session.stop()
@@ -128,7 +129,6 @@ class TcpClientRequestor(threading.Thread):
     def run(self):
         while not self.shared.stopped():
             if not self.update():
-                self.session.stop()
                 break
 
             while self.parse():