command line: wait until daemon is connected
This commit is contained in:
@@ -125,7 +125,8 @@ class ClientThread(threading.Thread):
|
||||
try:
|
||||
new_id = self.network.interface.send([(method, params)], cb) [0]
|
||||
except Exception as e:
|
||||
self.queue.put(out = {'id':_id, 'error':str(e)})
|
||||
self.queue.put({'id':_id, 'error':str(e)})
|
||||
print_error("network interface error", str(e))
|
||||
return
|
||||
|
||||
self.unanswered_requests[new_id] = _id
|
||||
|
||||
@@ -117,7 +117,7 @@ class Network(threading.Thread):
|
||||
self.subscriptions[self.on_peers] = [('server.peers.subscribe',[])]
|
||||
self.pending_transactions_for_notifications = []
|
||||
|
||||
self.connection_status = 'disconnected'
|
||||
self.connection_status = 'connecting'
|
||||
|
||||
def set_status(self, status):
|
||||
self.connection_status = status
|
||||
|
||||
@@ -54,7 +54,7 @@ class NetworkProxy(threading.Thread):
|
||||
self.daemon = True
|
||||
|
||||
# status variables
|
||||
self.status = 'disconnected'
|
||||
self.status = 'connecting'
|
||||
self.servers = {}
|
||||
self.banner = ''
|
||||
self.height = 0
|
||||
@@ -181,6 +181,9 @@ class NetworkProxy(threading.Thread):
|
||||
def is_connected(self):
|
||||
return self.status == 'connected'
|
||||
|
||||
def is_connecting(self):
|
||||
return self.status == 'connecting'
|
||||
|
||||
def is_up_to_date(self):
|
||||
return self.synchronous_get([('network.is_up_to_date',[])])[0]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user