Merge branch 'master' of git://gitorious.org/electrum/electrum

2012-02-08 14:19:39 +01:00 · 2012-02-08 14:19:39 +01:00 · 80a6706343
parent 94c6a1f6cf 458381f79d
commit 80a6706343
1 changed files with 6 additions and 1 deletions
--- a/server/server.py
+++ b/server/server.py
@ -749,9 +749,14 @@ if __name__ == '__main__':
            store.catch_up()
            memorypool_update(store)
            block_number = store.get_block_number(1)
-            dblock.release()
+        except IOError:
+            print "IOError: cannot reach bitcoind"
+            block_number = -1 
        except:
            traceback.print_exc(file=sys.stdout)
+            block_number = -1
+        finally:
+            dblock.release()
        time.sleep(10)

    print "server stopped"