kallithea Changeset - 67377fd685be

Changeset - 67377fd685be

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Les Peabody - 14 years ago 2011-10-20 17:58:11
lpeabody@ccom.unh.edu

applied smth_auth options update patch

3 files changed with 9 insertions and 2 deletions:

rhodecode/config/deployment.ini_tmpl

rhodecode/lib/celerylib/tasks.py

rhodecode/lib/smtp_mailer.py

0 comments (0 inline, 0 general)

rhodecode/config/deployment.ini_tmpl

➞

Show inline comments

@@ @@ -21,12 +21,14 @@ pdebug = false @@
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
 # Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth =
 [server:main]
 ##nr of threads to spawn
 threadpool_workers = 5
 ##max request before thread respawn

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -353,15 +353,16 @@ def send_email(recipients, subject, body @@
     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'))
     smtp_auth = email_config.get('smtp_auth')
     try:
         m = SmtpMailer(mail_from, user, passwd, mail_server,
+        m = SmtpMailer(mail_from, user, passwd, mail_server,smtp_auth,
                        mail_port, ssl, tls, debug=debug)
         m.send(recipients, subject, body)
     except:
         log.error('Mail sending failed')
         log.error(traceback.format_exc())
         return False

rhodecode/lib/smtp_mailer.py

➞

Show inline comments

@@ @@ -33,12 +33,13 @@ from email.mime.audio import MIMEAudio @@
 from email.mime.base import MIMEBase
 from email.mime.text import MIMEText
 from email.utils import formatdate
 from email import encoders
 class SmtpMailer(object):
     """SMTP mailer class
     mailer = SmtpMailer(mail_from, user, passwd, mail_server,
                         mail_port, ssl, tls)
     mailer.send(recipients, subject, body, attachment_files)
@@ @@ -46,23 +47,24 @@ class SmtpMailer(object): @@
     :param recipients might be a list of string or single string
     :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,
+    def __init__(self, mail_from, user, passwd, mail_server,smtp_auth,
                     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 = debug
         self.auth = smtp_auth
     def send(self, recipients=[], subject='', body='', attachment_files=None):
         if isinstance(recipients, basestring):
             recipients = [recipients]
         if self.ssl:
@@ @@ -75,12 +77,14 @@ class SmtpMailer(object): @@
             smtp_serv.starttls()
         if self.debug:
             smtp_serv.set_debuglevel(1)
         smtp_serv.ehlo()
         if self.auth:
             smtp_serv.esmtp_features["auth"] = self.auth
         #if server requires authorization you must provide login and password
         #but only if we have them
         if self.user and self.passwd:
             smtp_serv.login(self.user, self.passwd)

0 comments (0 inline, 0 general)