tMerge branch 'master' of git://gitorious.org/electrum/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 80a6706343bdfea87b573314281dc47514fc6c34
DIR parent 94c6a1f6cf00f7587eb65d91c322adebd6ca0454
HTML Author: thomasv <thomasv@gitorious>
Date: Wed, 8 Feb 2012 14:19:39 +0100
Merge branch 'master' of git://gitorious.org/electrum/electrum
Diffstat:
M server/server.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
DIR diff --git a/server/server.py b/server/server.py
t@@ -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"