Merge branch 'develop-email_date_header' into 'master'
Header für E-Mail-Output angepasst See merge request tools/heimdall!2
This commit is contained in:
commit
eafd2e6c45
|
|
@ -73,6 +73,7 @@ class implementation_notification_channel_email(interface_notification_channel):
|
||||||
[implementation]
|
[implementation]
|
||||||
'''
|
'''
|
||||||
def notify(self, parameters, name, data, state, info):
|
def notify(self, parameters, name, data, state, info):
|
||||||
|
datetime = _datetime.datetime.utcnow()
|
||||||
smtp_connection = _smtplib.SMTP(
|
smtp_connection = _smtplib.SMTP(
|
||||||
parameters["access"]["host"]
|
parameters["access"]["host"]
|
||||||
)
|
)
|
||||||
|
|
@ -101,6 +102,20 @@ class implementation_notification_channel_email(interface_notification_channel):
|
||||||
)
|
)
|
||||||
message["From"] = parameters["sender"]
|
message["From"] = parameters["sender"]
|
||||||
message["To"] = ",".join(parameters["receivers"])
|
message["To"] = ",".join(parameters["receivers"])
|
||||||
|
message["Date"] = string_coin(
|
||||||
|
"{{day_of_week}}, {{day_of_month}} {{month}} {{year}} {{hour}}:{{minute}}:{{second}} {{time_offset}}",
|
||||||
|
{
|
||||||
|
"day_of_week": datetime.strftime("%a"),
|
||||||
|
"day_of_month": datetime.strftime("%d"),
|
||||||
|
"month": datetime.strftime("%b"),
|
||||||
|
"year": datetime.strftime("%Y"),
|
||||||
|
"hour": datetime.strftime("%H"),
|
||||||
|
"minute": datetime.strftime("%M"),
|
||||||
|
"second": datetime.strftime("%S"),
|
||||||
|
# "time_offset": datetime.strftime("%z"),
|
||||||
|
"time_offset": "+0000",
|
||||||
|
}
|
||||||
|
)
|
||||||
smtp_connection.sendmail(
|
smtp_connection.sendmail(
|
||||||
parameters["sender"],
|
parameters["sender"],
|
||||||
parameters["receivers"],
|
parameters["receivers"],
|
||||||
|
|
|
||||||
|
|
@ -8,5 +8,6 @@ import json as _json
|
||||||
import requests as _requests
|
import requests as _requests
|
||||||
import enum as _enum
|
import enum as _enum
|
||||||
import time as _time
|
import time as _time
|
||||||
|
import datetime as _datetime
|
||||||
import smtplib as _smtplib
|
import smtplib as _smtplib
|
||||||
from email.mime.text import MIMEText
|
from email.mime.text import MIMEText
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue