open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display message-of-the-day, if the server offers one

Browse Source
This commit is contained in:
Brian Warner 2015-04-09 12:45:12 -07:00
parent 5ff59c92e0
commit ecc04ff675
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wormhole/blocking/transcribe.py
View File

@ -96,9 +96,18 @@ class Common:
url += "/" + msgnum url += "/" + msgnum
return url return url
motd_displayed = False
version_warning_displayed = False version_warning_displayed = False
def handle_welcome(self, welcome): def handle_welcome(self, welcome):
if ("motd" in welcome and
not self.motd_displayed):
motd_lines = welcome["motd"].splitlines()
motd_formatted = "\n ".join(motd_lines)
print("Server (at %s) says:\n %s" % (self.relay, motd_formatted),
file=sys.stderr)
self.motd_displayed = True
# Only warn if we're running a release version (e.g. 0.0.6, not # Only warn if we're running a release version (e.g. 0.0.6, not
# 0.0.6-DISTANCE-gHASH). Only warn once. # 0.0.6-DISTANCE-gHASH). Only warn once.
if ("-" not in __version__ and if ("-" not in __version__ and
@ -108,6 +117,7 @@ class Common:
print("Server claims %s is current, but ours is %s" print("Server claims %s is current, but ours is %s"
% (welcome["current_version"], __version__), file=sys.stderr) % (welcome["current_version"], __version__), file=sys.stderr)
self.version_warning_displayed = True self.version_warning_displayed = True
if "error" in welcome: if "error" in welcome:
raise ServerError(welcome["error"], self.relay) raise ServerError(welcome["error"], self.relay)

4
src/wormhole/servers/relay.py
View File

@ -48,7 +48,9 @@ class EventsProtocol:
WELCOME = { WELCOME = {
"current_version": __version__, "current_version": __version__,
"motd": "Welcome to the public relay.", # adding .motd will cause all clients to display the message, then keep
# running normally
#"motd": "Welcome to the public relay.\nPlease enjoy this service.",
# adding .error will cause all clients to fail, with this message # adding .error will cause all clients to fail, with this message
#"error": "This server has been disabled, see URL for details.", #"error": "This server has been disabled, see URL for details.",
} }