From eb05aaf709f377a936986103aeb7554ce306a5da Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Tue, 27 Mar 2018 10:22:49 -0400 Subject: [PATCH] 3.3.0 --- CHANGELOG.md | 4 ++-- parsedmarc/__init__.py | 2 +- parsedmarc/elastic.py | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a6a7ff..5899e2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ -3.2.1 +3.3.0 ----- -- Fix error saving to Elasticsearch +- Fix errors when saving to Elasticsearch 3.2.0 diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py index 77d027c..fb42b77 100644 --- a/parsedmarc/__init__.py +++ b/parsedmarc/__init__.py @@ -41,7 +41,7 @@ import imapclient.exceptions import dateparser import mailparser -__version__ = "3.2.1" +__version__ = "3.3.0" logger = logging.getLogger(__name__) logger.setLevel(logging.INFO) diff --git a/parsedmarc/elastic.py b/parsedmarc/elastic.py index c833774..8670c30 100644 --- a/parsedmarc/elastic.py +++ b/parsedmarc/elastic.py @@ -196,6 +196,7 @@ def save_aggregate_report_to_elasticsearch(aggregate_report): domain = aggregate_report["policy_published"]["domain"] begin_date = parsedmarc.human_timestamp_to_datetime(metadata["begin_date"]) end_date = parsedmarc.human_timestamp_to_datetime(metadata["end_date"]) + begin_date_human = end_date.strftime("%Y-%m-%d %H:%M:%S") end_date_human = end_date.strftime("%Y-%m-%d %H:%M:%S") aggregate_report["begin_date"] = begin_date aggregate_report["end_date"] = end_date @@ -213,10 +214,11 @@ def save_aggregate_report_to_elasticsearch(aggregate_report): existing = search.execute() if len(existing) > 0: - raise AlreadySaved("Aggregate report from {0} about {1} with end date " - "{2} already exists in " + raise AlreadySaved("Aggregate report from {0} about {1} with date " + "range of {2} UTC to {3} UTC already exists in " "Elasticsearch".format(org_name, domain, + begin_date_human, end_date_human)) published_policy = PublishedPolicy( adkim=aggregate_report["policy_published"]["adkim"],