Changeset 1499

Timestamp:

07/09/08 15:01:56 (4 months ago)

Author:

nick

Message:

Merged source:pyamf/branches/server-name-317-2.

Fixes: #317, #326
Author: nick
Reviewer: thijs

Location:

pyamf/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• pyamf/remoting/client/__init__.py (modified) (3 diffs)
• pyamf/remoting/gateway/__init__.py (modified) (1 diff)
• pyamf/remoting/gateway/django.py (modified) (4 diffs)
• pyamf/remoting/gateway/google.py (modified) (8 diffs)
• pyamf/remoting/gateway/twisted.py (modified) (4 diffs)
• pyamf/remoting/gateway/wsgi.py (modified) (8 diffs)
• setup.py (modified) (1 diff)

pyamf/trunk/CHANGES.txt

@@ -7 +7 @@
 0.4.0 (unreleased)
 ------------------
+ - The remoting gateways now send a customizable Server header (Ticket:317)
  - The remoting client now sends a customizable User-Agent header (Ticket:306)
  - Added ability to set the HTTP referer in remoting client (Ticket:316)

pyamf/trunk/pyamf/remoting/client/__init__.py

@@ -397 +397 @@
         self.logger.debug('Waiting for response...')
         http_response = self.connection.getresponse()
-        self.logger.debug('Got response status = %s' % http_response.status)
-        self.logger.debug('Content-Type = %s' % http_response.getheader('Content-Type'))
+        self.logger.debug('Got response status: %s' % http_response.status)
+        self.logger.debug('Content-Type: %s' % http_response.getheader('Content-Type'))
         
         if http_response.status != HTTP_OK:
-            self.logger.debug('Body = %s' % http_response.read())
+            self.logger.debug('Body: %s' % http_response.read())
 
             if hasattr(httplib, 'responses'):
@@ -420 +420 @@
         bytes = ''
 
-        self.logger.debug('Content-Length = %s' % content_length)
-
+        self.logger.debug('Content-Length: %s' % content_length)
+        self.logger.debug('Server: %s' % http_response.getheader('Server'))
+        
         if content_length is None:
             bytes = http_response.read()
@@ -430 +431 @@
 
         response = remoting.decode(bytes)
-        self.logger.debug('Response = %s' % response)
+        self.logger.debug('Response: %s' % response)
 
         if remoting.APPEND_TO_GATEWAY_URL in response.headers:

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

@@ -8 +8 @@
 """
 
-import types
+import sys, types
 
 import pyamf
 from pyamf import remoting, logging, util
+
+SERVER_NAME = 'PyAMF/%s Python/%s' % (
+    '.'.join(map(lambda x: str(x), pyamf.__version__)),
+    '.'.join(map(lambda x: str(x), sys.version_info[0:3]))
+)
 
 fault_alias = pyamf.get_class_alias(remoting.ErrorFault)

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

@@ -87 +87 @@
             request = remoting.decode(http_request.raw_post_data, context)
         except pyamf.DecodeError:
-            self.logger.error(gateway.format_exception())
+            self.logger.exception(gateway.format_exception())
             http_response.status_code = 400
 
@@ -100 +100 @@
             raise
         except:
-            self.logger.error(gateway.format_exception())
+            self.logger.exception(gateway.format_exception())
 
             return http.HttpResponseServerError()
@@ -110 +110 @@
             stream = remoting.encode(response, context)
         except pyamf.EncodeError:
-            self.logger.error(gateway.format_exception())
+            self.logger.exception(gateway.format_exception())
 
             return http.HttpResponseServerError('Unable to encode the response')
@@ -117 +117 @@
         http_response['Content-Type'] = remoting.CONTENT_TYPE
         http_response['Content-Length'] = str(len(buf))
+        http_response['Server'] = gateway.SERVER_NAME
         http_response.write(buf)
 

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

@@ -60 +60 @@
     def get(self):
         self.response.headers['Content-Type'] = 'text/plain'
+        self.response.headers['Server'] = gateway.SERVER_NAME
         self.error(405)
         self.response.out.write("405 Method Not Allowed\n\n" + \
@@ -75 +76 @@
             request = remoting.decode(body, context)
         except pyamf.DecodeError:
-            self.logger.error(gateway.format_exception())
+            self.logger.exception(gateway.format_exception())
 
             response = "400 Bad Request\n\nThe request body was unable to " \
@@ -85 +86 @@
             self.error(400)
             self.response.headers['Content-Type'] = 'text/plain'
+            self.response.headers['Server'] = gateway.SERVER_NAME
             self.response.out.write(response)
 
@@ -97 +99 @@
             raise
         except:
-            self.logger.error(gateway.format_exception())
+            self.logger.exception(gateway.format_exception())
 
             response = "500 Internal Server Error\n\nThe request was " \
@@ -107 +109 @@
             self.error(500)
             self.response.headers['Content-Type'] = 'text/plain'
+            self.response.headers['Server'] = gateway.SERVER_NAME
             self.response.out.write(response)
 
@@ -117 +120 @@
             stream = remoting.encode(response, context)
         except pyamf.EncodeError:
-            self.logger.error(gateway.format_exception())
+            self.logger.exception(gateway.format_exception())
 
             response = "500 Internal Server Error\n\nThe request was " \
@@ -127 +130 @@
             self.error(500)
             self.response.headers['Content-Type'] = 'text/plain'
+            self.response.headers['Server'] = gateway.SERVER_NAME
             self.response.out.write(response)
 
@@ -135 +139 @@
         self.response.headers['Content-Type'] = remoting.CONTENT_TYPE
         self.response.headers['Content-Length'] = str(len(response))
+        self.response.headers['Server'] = gateway.SERVER_NAME
+        
         self.response.out.write(response)
 

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

@@ -69 +69 @@
 
         def response_cb(result):
-            self.gateway.logger.debug("AMF Response: %r" % result)
             response.body = result
+
+            self.gateway.logger.debug("AMF Response: %r" % response)
             deferred_response.callback(response)
 
@@ -124 +125 @@
 
         def response_cb(result):
-            self.gateway.logger.debug("AMF Response: %r" % result)
+            
             ro_response.body = result
-            deferred_response.callback(remoting.Response(ro_response))
+            res = remoting.Response(ro_response)
+            self.gateway.logger.debug("AMF Response: %r" % res)
+            
+            deferred_response.callback(res)
 
         def process_cb(result):
@@ -195 +199 @@
         request.setHeader("Content-Type", mimetype)
         request.setHeader("Content-Length", str(len(content)))
+        request.setHeader("Server", gateway.SERVER_NAME)
 
         request.write(content)
@@ -210 +215 @@
             Return HTTP 400 Bad Request.
             """
-            self.logger.error(failure.printDetailedTraceback())
+            self.logger.exception(failure.printDetailedTraceback())
 
             body = "400 Bad Request\n\nThe request body was unable to " \

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

@@ -61 +61 @@
             ('Content-Type', 'text/plain'),
             ('Content-Length', str(len(response))),
+            ('Server', gateway.SERVER_NAME),
         ])
 
@@ -82 +83 @@
             request = remoting.decode(body, context)
         except pyamf.DecodeError:
-            self.logger.error(gateway.format_exception())
+            self.logger.exception(gateway.format_exception())
 
             response = "400 Bad Request\n\nThe request body was unable to " \
@@ -93 +94 @@
                 ('Content-Type', 'text/plain'),
                 ('Content-Length', str(len(response))),
+                ('Server', gateway.SERVER_NAME),
             ])
 
@@ -105 +107 @@
             raise
         except:
-            self.logger.error(gateway.format_exception())
+            self.logger.exception(gateway.format_exception())
 
             response = "500 Internal Server Error\n\nThe request was " \
@@ -116 +118 @@
                 ('Content-Type', 'text/plain'),
                 ('Content-Length', str(len(response))),
+                ('Server', gateway.SERVER_NAME),
             ])
 
@@ -126 +129 @@
             stream = remoting.encode(response, context)
         except pyamf.EncodeError:
-            self.logger.error(gateway.format_exception())
+            self.logger.exception(gateway.format_exception())
 
             response = "500 Internal Server Error\n\nThe request was " \
@@ -137 +140 @@
                 ('Content-Type', 'text/plain'),
                 ('Content-Length', str(len(response))),
+                ('Server', gateway.SERVER_NAME),
             ])
 
@@ -146 +150 @@
             ('Content-Type', remoting.CONTENT_TYPE),
             ('Content-Length', str(len(response))),
+            ('Server', gateway.SERVER_NAME),
         ])
 

pyamf/trunk/setup.py

@@ -20 +20 @@
 
     def run_tests(self):
+        import logging
+        logging.basicConfig(level=logging.CRITICAL)
         try:
             import twisted