[Pkg-privacy-commits] [obfsproxy] 78/353: Make the info logging severity a bit less noisy.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfsproxy.

commit fb2c11854d62ad5e271701c3375ead74dfaa7b43
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Oct 29 19:40:52 2012 +0200

    Make the info logging severity a bit less noisy.
---
 obfsproxy.py                 |  2 +-
 obfsproxy/network/network.py | 10 +++++-----
 obfsproxy/network/socks.py   |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/obfsproxy.py b/obfsproxy.py
index 335bd63..43b4ad7 100755
--- a/obfsproxy.py
+++ b/obfsproxy.py
@@ -89,9 +89,9 @@ def do_external_mode(args):
         factory = socks.SOCKSv4Factory(transportClass)
 
     reactor.listenTCP(int(args.listen_addr[1]), factory)
+    log.info("Launching listener.")
     reactor.run()
 
-
 def consider_cli_args(args):
     """Check out parsed CLI arguments and take the appropriate actions."""
 
diff --git a/obfsproxy/network/network.py b/obfsproxy/network/network.py
index 819518f..581bba8 100644
--- a/obfsproxy/network/network.py
+++ b/obfsproxy/network/network.py
@@ -151,7 +151,7 @@ class Circuit(Protocol):
                 log.debug("%s: upstream: Received %d bytes." % (self.name, len(data)))
                 self.transport.receivedUpstream(data, self)
         except base.PluggableTransportError, err: # Our transport didn't like that data.
-            log.info("%s: %s: Closing circuit." % (self.name, str(err)))
+            log.debug("%s: %s: Closing circuit." % (self.name, str(err)))
             self.close()
 
     def close(self):
@@ -160,7 +160,7 @@ class Circuit(Protocol):
         """
         if self.closed: return # NOP if already closed
 
-        log.info("%s: Tearing down circuit." % self.name)
+        log.debug("%s: Tearing down circuit." % self.name)
 
         if self.downstream: self.downstream.close()
         if self.upstream: self.upstream.close()
@@ -297,7 +297,7 @@ class StaticDestinationClientFactory(Factory):
         pass # connectionLost event is handled on the Protocol.
 
     def clientConnectionFailed(self, connector, reason):
-        log.info("%s: Connection failed (%s)." % (self.name, reason.getErrorMessage()))
+        log.debug("%s: Connection failed (%s)." % (self.name, reason.getErrorMessage()))
         self.circuit.close()
 
 class StaticDestinationServerFactory(Factory):
@@ -326,10 +326,10 @@ class StaticDestinationServerFactory(Factory):
         assert(self.mode == 'client' or self.mode == 'server')
 
     def startFactory(self):
-        log.info("%s: Starting up static destination server factory." % self.name)
+        log.debug("%s: Starting up static destination server factory." % self.name)
 
     def buildProtocol(self, addr):
-        log.info("%s: New connection." % self.name)
+        log.debug("%s: New connection." % self.name)
 
         circuit = Circuit(self.transport_class())
 
diff --git a/obfsproxy/network/socks.py b/obfsproxy/network/socks.py
index dcc1e42..4ead850 100644
--- a/obfsproxy/network/socks.py
+++ b/obfsproxy/network/socks.py
@@ -109,11 +109,11 @@ class SOCKSv4Protocol(socks.SOCKSv4):
         self.circuit.dataReceived(self.buffer, self)
 
     def connectionLost(self, reason):
-        log.info("%s: Connection was lost (%s)." % (self.name, reason.getErrorMessage()))
+        log.debug("%s: Connection was lost (%s)." % (self.name, reason.getErrorMessage()))
         self.circuit.close()
 
     def connectionFailed(self, reason):
-        log.info("%s: Connection failed to connect (%s)." % (self.name, reason.getErrorMessage()))
+        log.debug("%s: Connection failed to connect (%s)." % (self.name, reason.getErrorMessage()))
         self.circuit.close()
 
     def close(self): # XXX code duplication
@@ -140,10 +140,10 @@ class SOCKSv4Factory(Factory):
         self.name = "socks_fact_%s" % hex(id(self))
 
     def startFactory(self):
-        log.info("%s: Starting up SOCKS server factory." % self.name)
+        log.debug("%s: Starting up SOCKS server factory." % self.name)
 
     def buildProtocol(self, addr):
-        log.info("%s: New connection." % self.name)
+        log.debug("%s: New connection." % self.name)
 
         circuit = network.Circuit(self.transport_class())
         self.circuits.append(circuit)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfsproxy.git