Changeset 1441

Timestamp:

06/20/08 11:39:41 (5 months ago)

Author:

thijs

Message:

Error logging update; use logger.error for exceptions, added request/response debug logging to gateways.

Location:

pyamf/trunk/pyamf/remoting/gateway

Files:

• __init__.py (modified) (1 diff)
• django.py (modified) (3 diffs)
• google.py (modified) (4 diffs)
• twisted.py (modified) (5 diffs)
• wsgi.py (modified) (5 diffs)

pyamf/trunk/pyamf/remoting/gateway/__init__.py

@@ -285 +285 @@
         if name in self.services:
             raise remoting.RemotingError, "Service %s already exists" % name
-
+        
         self.services[name] = ServiceWrapper(service, description,
             authenticator, expose_request, preprocessor)

pyamf/trunk/pyamf/remoting/gateway/django.py

@@ -87 +87 @@
             request = remoting.decode(http_request.raw_post_data, context)
         except pyamf.DecodeError:
-            self.logger.debug(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
             http_response.status_code = 400
 
@@ -100 +100 @@
             raise
         except:
-            self.logger.debug(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             return http.HttpResponseServerError()
@@ -110 +110 @@
             stream = remoting.encode(response, context)
         except pyamf.EncodeError:
-            self.logger.debug(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             return http.HttpResponseServerError('Unable to encode the response')

pyamf/trunk/pyamf/remoting/gateway/google.py

@@ -75 +75 @@
             request = remoting.decode(body, context)
         except pyamf.DecodeError:
-            self.logger.debug(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             response = "400 Bad Request\n\nThe request body was unable to " \
@@ -89 +89 @@
             return
 
+        self.logger.debug("AMF Request: %r" % request)
+        
         # Process the request
         try:
@@ -95 +97 @@
             raise
         except:
-            self.logger.debug(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             response = "500 Internal Server Error\n\nThe request was " \
@@ -109 +111 @@
             return
 
+        self.logger.debug("AMF Response: %r" % response)
+        
         # Encode the response
         try:
             stream = remoting.encode(response, context)
         except pyamf.EncodeError:
-            self.logger.debug(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             response = "500 Internal Server Error\n\nThe request was " \

pyamf/trunk/pyamf/remoting/gateway/twisted.py

@@ -64 +64 @@
 
         def eb(failure):
-            self.gateway.logger.debug(failure.printTraceback())
+            self.gateway.logger.error(failure.printTraceback())
             deferred_response.callback(self.buildErrorResponse(
                 request, (failure.type, failure.value, failure.tb)))
@@ -119 +119 @@
 
         def eb(failure):
-            self.gateway.logger.debug(failure.printTraceback())
+            self.gateway.logger.error(failure.printTraceback())
             ro_response = self.buildErrorResponse(ro_request, (failure.type, failure.value, failure.tb))
             deferred_response.callback(remoting.Response(ro_response, status=remoting.STATUS_ERROR))
@@ -151 +151 @@
 
         def eb(failure):
-            self.gateway.logger.debug(failure.printTraceback())
+            self.gateway.logger.error(failure.printTraceback())
             deferred_response.callback(self.buildErrorResponse(ro_request,
                 (failure.type, failure.value, failure.tb)))
@@ -210 +210 @@
             Return HTTP 400 Bad Request.
             """
-            self.logger.debug(failure.printDetailedTraceback())
+            self.logger.error(failure.printDetailedTraceback())
 
             body = "400 Bad Request\n\nThe request body was unable to " \
@@ -245 +245 @@
             Return 500 Internal Server Error.
             """
-            self.logger.debug(failure.printDetailedTraceback())
+            self.logger.error(failure.printDetailedTraceback())
 
             body = "500 Internal Server Error\n\nThere was an error encoding" \

pyamf/trunk/pyamf/remoting/gateway/wsgi.py

@@ -48 +48 @@
             processor = self.getProcessor(message)
             response[name] = processor(message, http_request=environ)
-
+            
         return response
 
@@ -82 +82 @@
             request = remoting.decode(body, context)
         except pyamf.DecodeError:
-            self.logger.debug(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             response = "400 Bad Request\n\nThe request body was unable to " \
@@ -97 +97 @@
             return [response]
 
+        self.logger.debug("AMF Request: %r" % request)
+        
         # Process the request
         try:
@@ -103 +105 @@
             raise
         except:
-            self.logger.debug(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             response = "500 Internal Server Error\n\nThe request was " \
@@ -118 +120 @@
             return [response]
 
+        self.logger.debug("AMF Response: %r" % response)
+        
         # Encode the response
         try:
             stream = remoting.encode(response, context)
         except pyamf.EncodeError:
-            self.logger.debug(gateway.format_exception())
+            self.logger.error(gateway.format_exception())
 
             response = "500 Internal Server Error\n\nThe request was " \