use block_number=0 for no server; -1 means unknown session

[electrum-server.git] / server.py

diff --git a/server.py b/server.py
index 7cdbcd1..78c4098 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -717,6 +717,8 @@ if __name__ == '__main__':
             out = server.blockchain.transaction.broadcast(sys.argv[2])
         elif cmd == 'b':
             out = server.blocks()
+        else:
+            out = "Unknown command: '%s'" % cmd
         print out
         sys.exit(0)
 
@@ -749,9 +751,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 = 0
         except:
             traceback.print_exc(file=sys.stdout)
+            block_number = 0
+        finally:
+            dblock.release()
         time.sleep(10)
 
     print "server stopped"