From 2b628a90d432cec78047fd1e08461e9f7e6eef4f Mon Sep 17 00:00:00 2001 From: ThomasV Date: Wed, 8 Feb 2012 11:58:30 +0300 Subject: [PATCH 1/2] release lock in finally statement --- server/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/server.py b/server/server.py index 7cdbcd166..83f1f7428 100755 --- a/server/server.py +++ b/server/server.py @@ -749,9 +749,10 @@ if __name__ == '__main__': store.catch_up() memorypool_update(store) block_number = store.get_block_number(1) - dblock.release() except: traceback.print_exc(file=sys.stdout) + finally: + dblock.release() time.sleep(10) print "server stopped" From 252bb945a925c22c532280b8f1eb5e01cf29d69b Mon Sep 17 00:00:00 2001 From: ThomasV Date: Wed, 8 Feb 2012 12:07:42 +0300 Subject: [PATCH 2/2] block_number should return -1 if we know the DB is not up to date --- server/server.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/server.py b/server/server.py index 83f1f7428..973f932f8 100755 --- a/server/server.py +++ b/server/server.py @@ -749,8 +749,12 @@ if __name__ == '__main__': store.catch_up() memorypool_update(store) block_number = store.get_block_number(1) + 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)