diff options
author | Goblin911 <goblinliu@gmail.com> | 2013-08-26 22:03:11 +0800 |
---|---|---|
committer | Goblin911 <goblinliu@gmail.com> | 2013-08-26 22:03:11 +0800 |
commit | a33623ec00b323272fe1cf5188c64f2e495da18f (patch) | |
tree | 5259512eca35861f5c56b67197b62be1588d926e /server/piztor/server.py | |
parent | 9b17e1808a93840c265123925c2b60e55c2ec930 (diff) | |
parent | cf77f61bff7822b35020f2877ca4e6e683981be1 (diff) |
Merge branch 'master' of ssh://github.com/Determinant/piztor
Diffstat (limited to 'server/piztor/server.py')
-rw-r--r-- | server/piztor/server.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/server/piztor/server.py b/server/piztor/server.py index 5d2382d..d0cfc34 100644 --- a/server/piztor/server.py +++ b/server/piztor/server.py @@ -139,7 +139,7 @@ class UserAuthHandler(RequestHandler): logger.info("Logged in sucessfully: {0}".format(username)) uauth.regen_token() session.commit() - logger.info("new token generated: " + get_hex(uauth.token)) + logger.info("New token generated: " + get_hex(uauth.token)) return struct.pack("!LBBL32s", UserAuthHandler._response_size, _OptCode.user_auth, _StatusCode.sucess, @@ -333,7 +333,7 @@ class PTP(Protocol, TimeoutMixin): def dataReceived(self, data): self.buff += data self.resetTimeout() - print len(self.buff) + logger.info("Buffer length is now: %d", len(self.buff)) if len(self.buff) > 4: try: self.length, self.optcode = struct.unpack("!LB", self.buff[:5]) @@ -342,9 +342,7 @@ class PTP(Protocol, TimeoutMixin): except struct.error: logger.warning("Invalid request header") raise BadReqError("Malformed request header") - print self.length - if self.length == -1: - return + if self.length == -1: return if len(self.buff) == self.length: h = handlers[self.optcode]() reply = h.handle(self.buff[5:]) @@ -366,6 +364,6 @@ class PTPFactory(Factory): def buildProtocol(self, addr): return PTP(self) -endpoint = TCP4ServerEndpoint(reactor, 9990) +endpoint = TCP4ServerEndpoint(reactor, 2222) endpoint.listen(PTPFactory()) reactor.run() |