formatting

This commit is contained in:
Dave Schuyler 2005-01-15 06:13:17 +00:00
parent ba97dfddd8
commit 22175505f1
2 changed files with 29 additions and 35 deletions

View File

@ -53,9 +53,7 @@ class ClientRepository(ConnectionRepository.ConnectionRepository):
self.heartbeatStarted = 0 self.heartbeatStarted = 0
self.lastHeartbeat = 0 self.lastHeartbeat = 0
if wantOtpServer: if wantOtpServer:
## # Top level Interest Manager
## Top level Interest Manager
##
self._interestIdAssign = 1 self._interestIdAssign = 1
self._interests = {} self._interests = {}
@ -660,11 +658,7 @@ class ClientRepository(ConnectionRepository.ConnectionRepository):
self.considerHeartbeat() self.considerHeartbeat()
if wantOtpServer: if wantOtpServer:
## # interest managment
##
## interest managment
##
##
def addInterest(self, parentId, zoneId, description): def addInterest(self, parentId, zoneId, description):
""" """
Part of the new otp-server code. Part of the new otp-server code.

View File

@ -175,21 +175,21 @@ class ConnectionRepository(DirectObject.DirectObject, CConnectionRepository):
known. known.
""" """
## if self.recorder and self.recorder.isPlaying(): ## if self.recorder and self.recorder.isPlaying():
## # If we have a recorder and it's already in playback mode, ## # If we have a recorder and it's already in playback mode,
## # don't actually attempt to connect to a gameserver since ## # don't actually attempt to connect to a gameserver since
## # we don't need to. Just let it play back the data. ## # we don't need to. Just let it play back the data.
## self.notify.info("Not connecting to gameserver; using playback data instead.") ## self.notify.info("Not connecting to gameserver; using playback data instead.")
## self.connectHttp = 1 ## self.connectHttp = 1
## self.tcpConn = SocketStreamRecorder() ## self.tcpConn = SocketStreamRecorder()
## self.recorder.addRecorder('gameserver', self.tcpConn) ## self.recorder.addRecorder('gameserver', self.tcpConn)
## self.startReaderPollTask() ## self.startReaderPollTask()
## if successCallback: ## if successCallback:
## successCallback(*successArgs) ## successCallback(*successArgs)
## return ## return
hasProxy = 0 hasProxy = 0
if self.checkHttp(): if self.checkHttp():
@ -252,22 +252,22 @@ class ConnectionRepository(DirectObject.DirectObject, CConnectionRepository):
if ch.isConnectionReady(): if ch.isConnectionReady():
self.setConnectionHttp(ch) self.setConnectionHttp(ch)
## if self.recorder: ## if self.recorder:
## # If we have a recorder, we wrap the connect inside a ## # If we have a recorder, we wrap the connect inside a
## # SocketStreamRecorder, which will trap incoming data ## # SocketStreamRecorder, which will trap incoming data
## # when the recorder is set to record mode. (It will ## # when the recorder is set to record mode. (It will
## # also play back data when the recorder is in playback ## # also play back data when the recorder is in playback
## # mode, but in that case we never get this far in the ## # mode, but in that case we never get this far in the
## # code, since we just create an empty ## # code, since we just create an empty
## # SocketStreamRecorder without actually connecting to ## # SocketStreamRecorder without actually connecting to
## # the gameserver.) ## # the gameserver.)
## stream = SocketStreamRecorder(self.tcpConn, 1) ## stream = SocketStreamRecorder(self.tcpConn, 1)
## self.recorder.addRecorder('gameserver', stream) ## self.recorder.addRecorder('gameserver', stream)
## # In this case, we pass ownership of the original ## # In this case, we pass ownership of the original
## # connection to the SocketStreamRecorder object. ## # connection to the SocketStreamRecorder object.
## self.tcpConn.userManagesMemory = 0 ## self.tcpConn.userManagesMemory = 0
## self.tcpConn = stream ## self.tcpConn = stream
self.startReaderPollTask() self.startReaderPollTask()
if successCallback: if successCallback: