Merge branch 'master' into fix/dmarc

# Conflicts: # email_handler.py
2022-03-25 16:24:12 +01:00 · 2022-03-25 16:24:12 +01:00 · 334365e853
parent 17d9190309 2a4d2d723b
commit 334365e853
1 changed files with 4 additions and 2 deletions
--- a/email_handler.py
+++ b/email_handler.py
@ -545,10 +545,12 @@ def apply_dmarc_policy(
    dmarc_result = get_dmarc_status(msg)
    if dmarc_result:
        newrelic.agent.record_custom_event(
-            "Custom/dmarc_check", {"result": dmarc_result.name}
+            newrelic.agent.record_custom_event(
+                "DmarcCheck", {"result": dmarc_result.name}
+            )
        )
    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:
        return None