kallithea Changeset - f6dca275c5a8

Changeset - f6dca275c5a8

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 15 years ago 2011-03-22 18:10:37
marcin@python-works.com

control mailer debug with the .ini file

2 files changed with 4 insertions and 3 deletions:

rhodecode/lib/celerylib/tasks.py

rhodecode/lib/smtp_mailer.py

0 comments (0 inline, 0 general)

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -293,16 +293,17 @@ def send_email(recipients, subject, body @@
     user = email_config.get('smtp_username')
     passwd = email_config.get('smtp_password')
     mail_server = email_config.get('smtp_server')
     mail_port = email_config.get('smtp_port')
     tls = str2bool(email_config.get('smtp_use_tls'))
     ssl = str2bool(email_config.get('smtp_use_ssl'))
     debug = str2bool(config.get('debug'))
     try:
         m = SmtpMailer(mail_from, user, passwd, mail_server,
                        mail_port, ssl, tls)
+                       mail_port, ssl, tls, debug=debug)
         m.send(recipients, subject, body)
     except:
         log.error('Mail sending failed')
         log.error(traceback.format_exc())
         return False
     return True

rhodecode/lib/smtp_mailer.py

➞

Show inline comments

@@ @@ -33,22 +33,22 @@ class SmtpMailer(object): @@
     :param attachment_files is a dict of {filename:location}
         it tries to guess the mimetype and attach the file
     """
     def __init__(self, mail_from, user, passwd, mail_server,
                     mail_port=None, ssl=False, tls=False):
+                    mail_port=None, ssl=False, tls=False, debug=False):
         self.mail_from = mail_from
         self.mail_server = mail_server
         self.mail_port = mail_port
         self.user = user
         self.passwd = passwd
         self.ssl = ssl
         self.tls = tls
-        self.debug = False
+        self.debug = debug
     def send(self, recipients=[], subject='', body='', attachment_files=None):
         if isinstance(recipients, basestring):
             recipients = [recipients]
         if self.ssl:

0 comments (0 inline, 0 general)