mirror of
https://github.com/simple-login/app.git
synced 2024-09-20 15:05:59 +08:00
Merge branch 'master' into fix/dmarc
# Conflicts: # email_handler.py
This commit is contained in:
commit
334365e853
|
@ -545,10 +545,12 @@ def apply_dmarc_policy(
|
||||||
dmarc_result = get_dmarc_status(msg)
|
dmarc_result = get_dmarc_status(msg)
|
||||||
if dmarc_result:
|
if dmarc_result:
|
||||||
newrelic.agent.record_custom_event(
|
newrelic.agent.record_custom_event(
|
||||||
"Custom/dmarc_check", {"result": dmarc_result.name}
|
newrelic.agent.record_custom_event(
|
||||||
|
"DmarcCheck", {"result": dmarc_result.name}
|
||||||
|
)
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
newrelic.agent.record_custom_event("Custom/dmarc_check", {"result": "N/A"})
|
newrelic.agent.record_custom_event("DmarcCheck", {"result": "N/A"})
|
||||||
|
|
||||||
if not DMARC_CHECK_ENABLED or not dmarc_result:
|
if not DMARC_CHECK_ENABLED or not dmarc_result:
|
||||||
return None
|
return None
|
||||||
|
|
Loading…
Reference in a new issue