alberanid/diffido
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

default email sender

Browse source
This commit is contained in:
Davide Alberani 2018-01-23 09:10:26 +01:00
parent f6dd0f5393
commit 7d6850c678
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
diffido.py
View file

@ -33,6 +33,7 @@ JOBS_STORE = 'sqlite:///conf/jobs.db'
API_VERSION = '1.0' API_VERSION = '1.0'
SCHEDULES_FILE = 'conf/schedules.json' SCHEDULES_FILE = 'conf/schedules.json'
DEFAULT_CONF = 'conf/diffido.conf' DEFAULT_CONF = 'conf/diffido.conf'
EMAIL_FROM = 'diffido@localhost'
GIT_CMD = 'git' GIT_CMD = 'git'
re_insertion = re.compile(r'(\d+) insertion') re_insertion = re.compile(r'(\d+) insertion')
@ -161,7 +162,7 @@ def safe_run_job(id_=None, *args, **kwargs):
def send_email(to, subject='diffido', body='', from_=None): def send_email(to, subject='diffido', body='', from_=None):
msg = MIMEText(body) msg = MIMEText(body)
msg['Subject'] = subject msg['Subject'] = subject
msg['From'] = from_ or 'Diffido <da@mimante.net>' msg['From'] = from_ or EMAIL_FROM
msg['To'] = to msg['To'] = to
s = smtplib.SMTP('localhost') s = smtplib.SMTP('localhost')
s.send_message(msg) s.send_message(msg)
@ -423,6 +424,7 @@ class TemplateHandler(BaseHandler):
def serve(): def serve():
global EMAIL_FROM
jobstores = {'default': SQLAlchemyJobStore(url=JOBS_STORE)} jobstores = {'default': SQLAlchemyJobStore(url=JOBS_STORE)}
scheduler = TornadoScheduler(jobstores=jobstores) scheduler = TornadoScheduler(jobstores=jobstores)
scheduler.start() scheduler.start()
@ -439,8 +441,9 @@ def serve():
callback=lambda path: tornado.options.parse_config_file(path, final=False)) callback=lambda path: tornado.options.parse_config_file(path, final=False))
if not options.config and os.path.isfile(DEFAULT_CONF): if not options.config and os.path.isfile(DEFAULT_CONF):
tornado.options.parse_config_file(DEFAULT_CONF, final=False) tornado.options.parse_config_file(DEFAULT_CONF, final=False)
print(options.admin_email)
tornado.options.parse_command_line() tornado.options.parse_command_line()
if options.admin_email:
EMAIL_FROM = options.admin_email
if options.debug: if options.debug:
logger.setLevel(logging.DEBUG) logger.setLevel(logging.DEBUG)