Merge branch 'master' of git://gitorious.org/electrum/electrum
This commit is contained in:
commit
80a6706343
|
@ -749,9 +749,14 @@ if __name__ == '__main__':
|
||||||
store.catch_up()
|
store.catch_up()
|
||||||
memorypool_update(store)
|
memorypool_update(store)
|
||||||
block_number = store.get_block_number(1)
|
block_number = store.get_block_number(1)
|
||||||
dblock.release()
|
except IOError:
|
||||||
|
print "IOError: cannot reach bitcoind"
|
||||||
|
block_number = -1
|
||||||
except:
|
except:
|
||||||
traceback.print_exc(file=sys.stdout)
|
traceback.print_exc(file=sys.stdout)
|
||||||
|
block_number = -1
|
||||||
|
finally:
|
||||||
|
dblock.release()
|
||||||
time.sleep(10)
|
time.sleep(10)
|
||||||
|
|
||||||
print "server stopped"
|
print "server stopped"
|
||||||
|
|
Loading…
Reference in New Issue