Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More unittests for launcher

Browse source
This commit is contained in:
Griatch 2019-02-23 21:03:29 +01:00
parent 912eaf6bd8
commit d77dc93fcf
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
evennia/server/evennia_launcher.py
View file

@ -528,7 +528,7 @@ def _print_info(portal_info_dict, server_info_dict):
out = {} out = {}
for key, value in dct.iteritems(): for key, value in dct.iteritems():
if isinstance(value, list): if isinstance(value, list):
value = "\n{}".format(ind).join(value) value = "\n{}".format(ind).join(str(val) for val in value)
out[key] = value out[key] = value
return out return out
@ -695,13 +695,14 @@ def send_instruction(operation, arguments, callback=None, errback=None):
if AMP_CONNECTION: if AMP_CONNECTION:
# already connected - send right away # already connected - send right away
_send() return _send()
else: else:
# we must connect first, send once connected # we must connect first, send once connected
point = endpoints.TCP4ClientEndpoint(reactor, AMP_HOST, AMP_PORT) point = endpoints.TCP4ClientEndpoint(reactor, AMP_HOST, AMP_PORT)
deferred = endpoints.connectProtocol(point, AMPLauncherProtocol()) deferred = endpoints.connectProtocol(point, AMPLauncherProtocol())
deferred.addCallbacks(_on_connect, _on_connect_fail) deferred.addCallbacks(_on_connect, _on_connect_fail)
REACTOR_RUN = True REACTOR_RUN = True
return deferred
def query_status(callback=None): def query_status(callback=None):