From d4e897485392a34315b3738f21feee2062152c26 Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Thu, 11 Apr 2019 15:46:33 -0400 Subject: [PATCH] 6.3.2 - Fix the `monthly_indexes` option in the `elastocsearch` configuration section --- CHANGELOG.md | 5 +++++ parsedmarc/__init__.py | 2 +- parsedmarc/cli.py | 4 ++-- setup.py | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bb9072..30c5578 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +6.3.2 +----- + +- Fix the `monthly_indexes` option in the `elastocsearch` configuration section + 6.3.1 ----- diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py index 37bd870..e729bb9 100644 --- a/parsedmarc/__init__.py +++ b/parsedmarc/__init__.py @@ -38,7 +38,7 @@ from parsedmarc.utils import is_outlook_msg, convert_outlook_msg from parsedmarc.utils import timestamp_to_human, human_timestamp_to_datetime from parsedmarc.utils import parse_email -__version__ = "6.3.1" +__version__ = "6.3.2" logging.basicConfig( format='%(levelname)8s:%(filename)s:%(lineno)d:' diff --git a/parsedmarc/cli.py b/parsedmarc/cli.py index 8e9827c..88f5a4e 100644 --- a/parsedmarc/cli.py +++ b/parsedmarc/cli.py @@ -307,8 +307,8 @@ def _main(): opts.elasticsearch_index_suffix = elasticsearch_config[ "index_suffix"] if "monthly_indexes" in elasticsearch_config: - opts.elasticsearch_monthly_indexes = elasticsearch_config[ - "monthly_indexes"] + monthly = elasticsearch_config.getboolean("monthly_indexes") + opts.elasticsearch_monthly_indexes = monthly if "ssl" in elasticsearch_config: opts.elasticsearch_ssl = elasticsearch_config.getboolean( "ssl") diff --git a/setup.py b/setup.py index 2339f5f..f63ed53 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ from setuptools import setup from codecs import open from os import path -__version__ = "6.3.1" +__version__ = "6.3.2" description = "A Python package and CLI for parsing aggregate and " \ "forensic DMARC reports"