Merge pull request #12 from EagleTM/master

missing try in main loop, increase timeout irc

diff --git a/backends/abe/__init__.py b/backends/abe/__init__.py
index 251dc13..7a2cb02 100644 (file)
--- a/backends/abe/__init__.py
+++ b/backends/abe/__init__.py
@@ -797,8 +797,11 @@ class BlockchainProcessor(Processor):
             except:
                 break
             if addr in self.watched_addresses:
-                status = self.store.get_status( addr )
-                self.push_response({ 'id': None, 'method':'blockchain.address.subscribe', 'params':[addr, status] })
+                try:
+                    status = self.store.get_status( addr )
+                    self.push_response({ 'id': None, 'method':'blockchain.address.subscribe', 'params':[addr, status] })
+                except:
+                    break
 
         threading.Timer(10, self.run_store_iteration).start()
 

diff --git a/backends/irc/__init__.py b/backends/irc/__init__.py
index efdb6ad..e13c6c6 100644 (file)
--- a/backends/irc/__init__.py
+++ b/backends/irc/__init__.py
@@ -62,7 +62,7 @@ class IrcThread(threading.Thread):
             try:
                 s = socket.socket()
                 s.connect(('irc.freenode.net', 6667))
-                s.settimeout(260)
+                s.settimeout(300)
             except:
                 s.close()
                 time.sleep(10)