[tor-commits] [gettor/master] Minor fixes

[ilv at torproject.org]

commit eb33e8f3aef58677e9b1cd2fd16c81643d7a0a7b
Author: ilv <ilv at users.noreply.github.com>
Date:   Tue Nov 17 13:33:54 2015 -0300

    Minor fixes
---
 gettor/smtp.py  |    5 +++--
 gettor/utils.py |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gettor/smtp.py b/gettor/smtp.py
index d6de2ed..ed6a4fc 100644
--- a/gettor/smtp.py
+++ b/gettor/smtp.py
@@ -504,7 +504,7 @@ class SMTP(object):
 
                 elif req['type'] == 'links':
                     self.log.debug("Trying to obtain the links...")
-                    self.log.info('links; %s; %s' % (req['os '], req['lc']))
+                    self.log.info('links; %s; %s' % (req['os'], req['lc']))
 
                     try:
                         links = self.core.get_links(
@@ -525,4 +525,5 @@ class SMTP(object):
                         self.log.debug("FAILED: %s" % str(e))
                         raise SendEmailError("Something's wrong with the SMTP "
                                              "server: %s" % str(e))
-                self.log.debug("Mail sent!")
+        finally:
+            self.log.debug("Request processed")
diff --git a/gettor/utils.py b/gettor/utils.py
index 8224f25..3f69e08 100644
--- a/gettor/utils.py
+++ b/gettor/utils.py
@@ -16,7 +16,7 @@ import hashlib
 """Common utilities for GetTor modules."""
 
 
-LOGGING_FORMAT = "[%(levelname)s] DATE: %(asctime)s; %(message)s"
+LOGGING_FORMAT = "[%(levelname)s] %(asctime)s; %(message)s"
 DATE_FORMAT = "%Y-%m-%d"  # %H:%M:%S