add message for startup status
-added daemon_status function that returns {'status': startup status message, 'is_running': true/false}
This commit is contained in:
parent
162275992b
commit
28a23590ef
1 changed files with 22 additions and 1 deletions
|
@ -100,7 +100,9 @@ class LBRYDaemon(jsonrpc.JSONRPC):
|
||||||
# versions...
|
# versions...
|
||||||
|
|
||||||
if not self.announced_startup:
|
if not self.announced_startup:
|
||||||
if functionPath not in ['is_running', 'check_first_run', 'get_time_behind_blockchain', 'stop']:
|
if functionPath not in ['is_running', 'check_first_run',
|
||||||
|
'get_time_behind_blockchain', 'stop',
|
||||||
|
'daemon_status']:
|
||||||
return server.failure
|
return server.failure
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
@ -212,6 +214,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
|
||||||
self.data_rate = MIN_BLOB_DATA_PAYMENT_RATE
|
self.data_rate = MIN_BLOB_DATA_PAYMENT_RATE
|
||||||
self.max_key_fee = DEFAULT_MAX_KEY_FEE
|
self.max_key_fee = DEFAULT_MAX_KEY_FEE
|
||||||
self.max_search_results = DEFAULT_MAX_SEARCH_RESULTS
|
self.max_search_results = DEFAULT_MAX_SEARCH_RESULTS
|
||||||
|
self.startup_status = "Initializing"
|
||||||
self.startup_message = ""
|
self.startup_message = ""
|
||||||
self.announced_startup = False
|
self.announced_startup = False
|
||||||
self.search_timeout = 3.0
|
self.search_timeout = 3.0
|
||||||
|
@ -254,6 +257,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
|
||||||
|
|
||||||
def _announce_startup():
|
def _announce_startup():
|
||||||
self.announced_startup = True
|
self.announced_startup = True
|
||||||
|
self.startus_status = None
|
||||||
log.info("[" + str(datetime.now()) + "] Started lbrynet-daemon")
|
log.info("[" + str(datetime.now()) + "] Started lbrynet-daemon")
|
||||||
return defer.succeed(None)
|
return defer.succeed(None)
|
||||||
|
|
||||||
|
@ -307,6 +311,8 @@ class LBRYDaemon(jsonrpc.JSONRPC):
|
||||||
f.close()
|
f.close()
|
||||||
return self.default_settings
|
return self.default_settings
|
||||||
|
|
||||||
|
self.startus_status = "Loading configuration"
|
||||||
|
|
||||||
d = _log_platform()
|
d = _log_platform()
|
||||||
d.addCallback(lambda _: _load_daemon_conf())
|
d.addCallback(lambda _: _load_daemon_conf())
|
||||||
|
|
||||||
|
@ -345,6 +351,8 @@ class LBRYDaemon(jsonrpc.JSONRPC):
|
||||||
return self._start_server()
|
return self._start_server()
|
||||||
return defer.succeed(True)
|
return defer.succeed(True)
|
||||||
|
|
||||||
|
self.startus_status = "Starting lbrynet"
|
||||||
|
|
||||||
dl = self.settings.get_server_running_status()
|
dl = self.settings.get_server_running_status()
|
||||||
dl.addCallback(restore_running_status)
|
dl.addCallback(restore_running_status)
|
||||||
return dl
|
return dl
|
||||||
|
@ -471,6 +479,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
|
||||||
return defer.succeed(None)
|
return defer.succeed(None)
|
||||||
|
|
||||||
def _setup_data_directory(self):
|
def _setup_data_directory(self):
|
||||||
|
self.startus_status = "Loading databases"
|
||||||
log.info("Loading databases...")
|
log.info("Loading databases...")
|
||||||
if self.created_data_dir:
|
if self.created_data_dir:
|
||||||
db_revision = open(os.path.join(self.db_dir, "db_revision"), mode='w')
|
db_revision = open(os.path.join(self.db_dir, "db_revision"), mode='w')
|
||||||
|
@ -526,6 +535,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
|
||||||
return d
|
return d
|
||||||
|
|
||||||
def _setup_lbry_file_manager(self):
|
def _setup_lbry_file_manager(self):
|
||||||
|
self.startus_status = "Loading file manager"
|
||||||
self.lbry_file_metadata_manager = DBLBRYFileMetadataManager(self.db_dir)
|
self.lbry_file_metadata_manager = DBLBRYFileMetadataManager(self.db_dir)
|
||||||
d = self.lbry_file_metadata_manager.setup()
|
d = self.lbry_file_metadata_manager.setup()
|
||||||
|
|
||||||
|
@ -548,6 +558,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
|
||||||
return d
|
return d
|
||||||
|
|
||||||
def get_wallet():
|
def get_wallet():
|
||||||
|
self.startup_status = "Loading wallet"
|
||||||
if self.wallet_type == "lbrycrd":
|
if self.wallet_type == "lbrycrd":
|
||||||
log.info("Using lbrycrd wallet")
|
log.info("Using lbrycrd wallet")
|
||||||
lbrycrdd_path = None
|
lbrycrdd_path = None
|
||||||
|
@ -580,6 +591,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
|
||||||
return r
|
return r
|
||||||
|
|
||||||
def create_session(results):
|
def create_session(results):
|
||||||
|
self.startus_status = "Loading lbrynet session"
|
||||||
self.session = LBRYSession(results['default_data_payment_rate'], db_dir=self.db_dir, lbryid=self.lbryid,
|
self.session = LBRYSession(results['default_data_payment_rate'], db_dir=self.db_dir, lbryid=self.lbryid,
|
||||||
blob_dir=self.blobfile_dir, dht_node_port=self.dht_node_port,
|
blob_dir=self.blobfile_dir, dht_node_port=self.dht_node_port,
|
||||||
known_dht_nodes=self.known_dht_nodes, peer_port=self.peer_port,
|
known_dht_nodes=self.known_dht_nodes, peer_port=self.peer_port,
|
||||||
|
@ -843,6 +855,15 @@ class LBRYDaemon(jsonrpc.JSONRPC):
|
||||||
else:
|
else:
|
||||||
return self._render_response(False, OK_CODE)
|
return self._render_response(False, OK_CODE)
|
||||||
|
|
||||||
|
def jsonrpc_daemon_status(self):
|
||||||
|
"""
|
||||||
|
Returns {'status': startup status message, 'is_running': true/false}
|
||||||
|
"""
|
||||||
|
|
||||||
|
r = {'status': self.startus_status, 'is_running': self.announced_startup}
|
||||||
|
log.info("[" + str(datetime.now()) + "] daemon status: " + str(r))
|
||||||
|
return self._render_response(r, OK_CODE)
|
||||||
|
|
||||||
def jsonrpc_check_first_run(self):
|
def jsonrpc_check_first_run(self):
|
||||||
try:
|
try:
|
||||||
d = self.session.wallet.is_first_run()
|
d = self.session.wallet.is_first_run()
|
||||||
|
|
Loading…
Add table
Reference in a new issue