Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

better status messages #452

Merged
merged 1 commit into from
May 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions images/utils/launcher/node/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,11 @@ def update_status(node, status):

def status_wrapper(container, name, update_status):
status = container.status()
if status.startswith("could not connect"):
update_status(name, "Waiting for xud...")
sleep(5)
status = container.status()

update_status(name, status)

class State:
Expand Down
2 changes: 1 addition & 1 deletion images/utils/launcher/node/bitcoind.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def status(self):
return str(e)
except:
self._logger.exception("Failed to get advanced running status")
return "Container running"
return "Waiting for bitcoind to come up..."
else:
return status

Expand Down
2 changes: 1 addition & 1 deletion images/utils/launcher/node/btcd.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def status(self):
return "Syncing %.2f (%d/%d)" % (current / total, current, total)
except:
self._logger.exception("Failed to get advanced running status")
return "Container running"
return "Waiting for {} to come up...".format("ltcd" if self.litecoin else "btcd")
else:
return status

Expand Down
2 changes: 1 addition & 1 deletion images/utils/launcher/node/geth.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,6 @@ def status(self):
return "Ready"
except:
self._logger.exception("Failed to get advanced running status")
return "Container running"
return "Waiting for geth to come up..."
else:
return status
2 changes: 1 addition & 1 deletion images/utils/launcher/node/lnd.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def status(self):
return "Wallet locked. Unlock with xucli unlock."
except:
self._logger.exception("Failed to get advanced running status")
return "Container running"
return "Waiting for lnd ({}) to come up...".format(self.chain)
else:
return status

Expand Down
4 changes: 2 additions & 2 deletions images/utils/launcher/node/raiden.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ def status(self):
# Waiting for the ethereum node to synchronize. [Use ^C to exit]
return "Waiting for sync"
else:
return "Container running"
return "Waiting for raiden to come up..."
self._logger.exception("Failed to get advanced running status")
return str(e)
except:
self._logger.exception("Failed to get advanced running status")
return "Container running"
return "Waiting for raiden to come up..."
else:
return status
2 changes: 1 addition & 1 deletion images/utils/launcher/node/xud.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def status(self):
return str(e)
except:
self._logger.exception("Failed to get advanced running status")
return "Container running"
return "Waiting for xud to come up..."
else:
return status

Expand Down