From c5f2e463c18c353c9e9c66fbe22c65d0879eed1e Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Wed, 9 Jan 2019 16:26:08 -0500 Subject: [PATCH] 5.2.0 --- CHANGELOG.md | 14 ++++++++++++++ parsedmarc/__init__.py | 7 ++++++- setup.py | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b629d4e..ad28d83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +5.2.0 +----- +- More details in logging output +- And CLI options + ``` + --elasticsearch-use-ssl + Use SSL when connecting to Elasticsearch + --elasticsearch-ssl-cert-path ELASTICSEARCH_SSL_CERT_PATH + Path to the Elasticsearch SSL certificate + --elasticsearch-monthly-indexes + Use monthly Elasticsearch indexes instead of daily + indexes + ``` + 5.1.3 ----- diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py index 0b79061..9d67b85 100644 --- a/parsedmarc/__init__.py +++ b/parsedmarc/__init__.py @@ -38,7 +38,12 @@ 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__ = "5.1.3" +__version__ = "5.2.0" + +logging.basicConfig( + format='%(asctime)s,%(msecs)d %(levelname)-8s [%(filename)s:%(lineno)d] ' + '%(message)s', + datefmt='%Y-%m-%d:%H:%M:%S') logger = logging.getLogger("parsedmarc") logger.debug("parsedmarc v{0}".format(__version__)) diff --git a/setup.py b/setup.py index d538118..6dda510 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ from setuptools import setup from codecs import open from os import path -__version__ = "5.1.3" +__version__ = "5.2.0" description = "A Python package and CLI for parsing aggregate and " \ "forensic DMARC reports"