Mercurial > hg > gcmultimerge
changeset 71:41881ba09ba8
Allow setting SMTP server .. needs more work tho.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 12 Jul 2016 10:27:38 +0300 |
| parents | d5e3ca4b609d |
| children | 1ab40033bb87 |
| files | example.cfg multimerge.py |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/example.cfg Tue Jul 12 10:27:13 2016 +0300 +++ b/example.cfg Tue Jul 12 10:27:38 2016 +0300 @@ -31,6 +31,9 @@ # Enable/disable sending of e-mail message in case of fatal errors email = off +# SMTP server for sending mail +email_server = localhost + # Message subject email_subject = Google Calendar MultiMerge error!
--- a/multimerge.py Tue Jul 12 10:27:13 2016 +0300 +++ b/multimerge.py Tue Jul 12 10:27:38 2016 +0300 @@ -60,7 +60,7 @@ msg["From"] = cfg.email_sender msg["To"] = ",".join(cfg.email_to) try: - smtpH = smtplib.SMTP('localhost') + smtpH = smtplib.SMTP(cfg.email_server) smtpH.sendmail(cfg.email_sender, cfg.email_to, msg.as_string()) smtpH.quit() except Exception as e: @@ -339,6 +339,7 @@ cfg.mdef("email_to", True, cfg.is_email_list, cfg.trans_email_list, None) cfg.mdef("email_sender", True, cfg.is_email, None, None) cfg.mdef("email_subject", True, cfg.is_string, None, u"Google Calendar MultiMerge status") +cfg.mdef("email_server", True, cfg.is_string, None, None) cfg.mdef("source_regex", True, cfg.is_string, None, u"^R:\s*(.*?)\s*\(\s*(.+?)\s*\)\s*$") cfg.mdef("source_regmap", False, cfg.is_list, cfg.trans_list, [1, 2])