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

Adding per-request log lines

Browse Source
This commit is contained in:
M. Ian Graham 2008-03-31 23:13:44 +00:00
parent e05620027f
commit 31824702f5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
direct/src/http/WebRequest.py
View File

@ -45,6 +45,9 @@ class WebRequest(object):
resp = "<html><body>Error 504: Request timed out</body></html>\r\n" resp = "<html><body>Error 504: Request timed out</body></html>\r\n"
self.respondHTTP("504 Gateway Timeout",resp) self.respondHTTP("504 Gateway Timeout",resp)
def getSourceAddress(self):
return self.connection.GetSourceAddress()
# -------------------------------------------------------------------------------- # --------------------------------------------------------------------------------
@ -103,6 +106,7 @@ class WebRequestDispatcher(object):
def invalidURI(self,replyTo,**kw): def invalidURI(self,replyTo,**kw):
resp = "<html><body>Error 404</body></html>\r\n" resp = "<html><body>Error 404</body></html>\r\n"
replyTo.respondHTTP("404 Not Found",resp) replyTo.respondHTTP("404 Not Found",resp)
self.notify.warning("%s - %s - 404" % (replyTo.getSourceAddress(),replyTo.getURI()))
def handleGET(self,req): def handleGET(self,req):
""" """
@ -112,7 +116,12 @@ class WebRequestDispatcher(object):
assert req.getRequestType() == "GET" assert req.getRequestType() == "GET"
uri = req.getURI() uri = req.getURI()
args = req.dictFromGET() args = req.dictFromGET()
callable,returnsResponse = self.uriToHandler.get(uri,[self.invalidURI,False])
callable,returnsResponse = self.uriToHandler.get(uri, [self.invalidURI,False])
if callable != self.invalidURI:
self.notify.info("%s - %s - %s - 200" % (req.getSourceAddress(), uri, args))
if returnsResponse: if returnsResponse:
result = apply(callable,(),args) result = apply(callable,(),args)
req.respond(result) req.respond(result)
@ -133,7 +142,8 @@ class WebRequestDispatcher(object):
if wreq.getRequestType() == "GET": if wreq.getRequestType() == "GET":
self.handleGET(wreq) self.handleGET(wreq)
else: else:
self.notify.warning("Ignoring a non-GET request: %s" % request.GetRawRequest()) self.notify.warning("Ignoring a non-GET request from %s: %s" % (request.GetSourceAddress(),request.GetRawRequest()))
self.invalidURI(wreq)
request = HttpRequest.HttpManagerGetARequest() request = HttpRequest.HttpManagerGetARequest()