TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-19 13:15:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

report status string as well as status code on failure to connect

Browse Source
This commit is contained in:
David Rose 2003-10-22 04:18:01 +00:00
parent b2c27a3348
commit 12a6dc05ce
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
direct/src/distributed/ConnectionRepository.py
View File

@ -131,7 +131,7 @@ class ConnectionRepository(DirectObject.DirectObject):
# Failed to connect. # Failed to connect.
if failureCallback: if failureCallback:
failureCallback(0, *failureArgs) failureCallback(0, '', *failureArgs)
def disconnect(self): def disconnect(self):
"""Closes the previously-established connection. """Closes the previously-established connection.
@ -160,6 +160,10 @@ class ConnectionRepository(DirectObject.DirectObject):
url = serverList[serverIndex] url = serverList[serverIndex]
self.notify.info("Connecting to %s via HTTP interface." % (url.cStr())) self.notify.info("Connecting to %s via HTTP interface." % (url.cStr()))
# Temporary test for old pandas.
if hasattr(ch, "preserveStatus"):
ch.preserveStatus()
ch.beginConnectTo(DocumentSpec(url)) ch.beginConnectTo(DocumentSpec(url))
ch.spawnTask(name = 'connect-to-server', ch.spawnTask(name = 'connect-to-server',
callback = self.httpConnectCallback, callback = self.httpConnectCallback,
@ -169,7 +173,8 @@ class ConnectionRepository(DirectObject.DirectObject):
else: else:
# No more servers to try; we have to give up now. # No more servers to try; we have to give up now.
if failureCallback: if failureCallback:
failureCallback(ch.getStatusCode(), *failureArgs) failureCallback(ch.getStatusCode(), ch.getStatusString(),
*failureArgs)
def checkHttp(self): def checkHttp(self):
# Creates an HTTPClient, if possible, if we don't have one # Creates an HTTPClient, if possible, if we don't have one