[Inteproxy-commits] r189 - in trunk: . inteproxy

[scm-commit@wald.intevation.org]

Author: bh
Date: 2009-03-12 12:03:58 +0100 (Thu, 12 Mar 2009)
New Revision: 189

Modified:
   trunk/ChangeLog
   trunk/inteproxy/proxyconnection.py
   trunk/inteproxy/proxycore.py
Log:
Some more debug log improvements: httplibs debug output is
activated whenever InteProxy is run with --debug-level > 1 and
it's produced for all http requests, not just the https proxy
ones.

* inteproxy/proxycore.py
(InteProxyHTTPRequestHandler.open_http_connection): Set the
connection's debug level if InteProxy's debug level > 1.  This
will prodcue more low-level debug information from http lib, so
that it's possible to see exactly what http sends to the server-

* inteproxy/proxyconnection.py: Do not set debug_level here.  Use
the value of the base class instead


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-03-11 20:12:33 UTC (rev 188)
+++ trunk/ChangeLog	2009-03-12 11:03:58 UTC (rev 189)
@@ -1,3 +1,19 @@
+2009-03-12  Bernhard Herzog  <bh at intevation.de>
+
+	Some more debug log improvements: httplibs debug output is
+	activated whenever InteProxy is run with --debug-level > 1 and
+	it's produced for all http requests, not just the https proxy
+	ones.
+
+	* inteproxy/proxycore.py
+	(InteProxyHTTPRequestHandler.open_http_connection): Set the
+	connection's debug level if InteProxy's debug level > 1.  This
+	will prodcue more low-level debug information from http lib, so
+	that it's possible to see exactly what http sends to the server-
+
+	* inteproxy/proxyconnection.py: Do not set debug_level here.  Use
+	the value of the base class instead
+
 2009-03-11  Bernhard Herzog  <bh at intevation.de>
 
 	Make connections via https-proxy more correct.

Modified: trunk/inteproxy/proxyconnection.py
===================================================================
--- trunk/inteproxy/proxyconnection.py	2009-03-11 20:12:33 UTC (rev 188)
+++ trunk/inteproxy/proxyconnection.py	2009-03-12 11:03:58 UTC (rev 189)
@@ -41,9 +41,6 @@
 
 class HTTPSProxyConnection(httplib.HTTPConnection):
 
-
-    debuglevel = 2
-
     def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0):
         if not skip_host:
             raise ValueError("HTTPSProxyConnection.putrequest must be called"

Modified: trunk/inteproxy/proxycore.py
===================================================================
--- trunk/inteproxy/proxycore.py	2009-03-11 20:12:33 UTC (rev 188)
+++ trunk/inteproxy/proxycore.py	2009-03-12 11:03:58 UTC (rev 189)
@@ -142,6 +142,8 @@
                                       "Basic %s" % userpass))
 
         connection = connection_class(*connect_address)
+        if self.debug_level > 1:
+            connection.set_debuglevel(self.debug_level)
         if self.request_version == "HTTP/1.0":
             connection._http_vsn = 10