[or-cvs] [torflow/master 48/92] minor logging changes

[mikeperry at torproject.org]

Author: John M. Schanck <john at anomos.info>
Date: Fri, 30 Jul 2010 21:54:42 -0400
Subject: minor logging changes
Commit: 9013bd69289b9b23df1e0e83f5404eeb9addc8e1

---
 NetworkScanners/ExitAuthority/soat.py |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py
index 8747cd3..6c34b56 100755
--- a/NetworkScanners/ExitAuthority/soat.py
+++ b/NetworkScanners/ExitAuthority/soat.py
@@ -363,7 +363,6 @@ def http_request(address, cookie_jar=None, headers=firefox_headers):
       traceback.print_exc()
       rval = (e.code, None, [], "", e.__class__.__name__+str(e))
   except (ValueError, urllib2.URLError), e:
-    plog('WARN', 'The http-request address ' + address + ' is malformed')
     if str(e) == "<urlopen error timed out>": # Yah, super ghetto...
       rval = (E_TIMEOUT, None, [], "", e.__class__.__name__+str(e))
     else:
@@ -1082,7 +1081,7 @@ class BaseHTTPTest(Test):
         added_cookie_jar.save(content_prefix+'.cookies', ignore_discard=True)
       except:
         traceback.print_exc()
-        plog("WARN", "Error saving cookies in "+str(self.cookie_jar)+" to "+content_prefix+".cookies")
+        plog("WARN", "Error saving cookies in "+str(added_cookie_jar)+" to "+content_prefix+".cookies")
 
     except TypeError, e:
       plog('ERROR', 'Failed obtaining the shasum for ' + address)
-- 
1.7.1