From 8ea0e62bdd0f1b95e6ac0a166da884f8a500d1de Mon Sep 17 00:00:00 2001
From: Sean Whalen <whalenster@gmail.com>
Date: Tue, 9 Oct 2018 20:21:17 -0400
Subject: [PATCH 1/2] Add more debug logging details

---
 parsedmarc/__init__.py | 6 +++---
 parsedmarc/splunk.py   | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py
index 04cd65c..65a06c2 100644
--- a/parsedmarc/__init__.py
+++ b/parsedmarc/__init__.py
@@ -1246,6 +1246,7 @@ def get_dmarc_reports_from_inbox(host=None,
             move_supported = "MOVE" in server_capabilities
 
         def delete_messages(msg_uids):
+            logger.debug("Deleting messages")
             if type(msg_uids) == str:
                 msg_uids = [msg_uids]
 
@@ -1284,9 +1285,8 @@ def get_dmarc_reports_from_inbox(host=None,
             server.create_folder(invalid_reports_folder)
         server.select_folder(reports_folder)
         messages = server.search()
-        logger.debug("Found {0} messages in IMAP folder".format(len(messages),
-                                                                reports_folder
-                                                                ))
+        logger.debug("Found {0} messages in IMAP folder "
+                     "{1}".format(len(messages), reports_folder))
         for i in range(len(messages)):
             number_of_messages = len(messages)
             message_uid = messages[i]
diff --git a/parsedmarc/splunk.py b/parsedmarc/splunk.py
index 5c1bd1a..1861897 100644
--- a/parsedmarc/splunk.py
+++ b/parsedmarc/splunk.py
@@ -61,6 +61,7 @@ class HECClient(object):
             to save in Splunk
 
         """
+        logger.debug("Saving aggregate reports to Splunk")
         if type(aggregate_reports) == dict:
             aggregate_reports = [aggregate_reports]
 
@@ -122,6 +123,7 @@ class HECClient(object):
             to save in Splunk
 
         """
+        logger.debug("Saving forensic reports to Splunk")
         if type(forensic_reports) == dict:
             forensic_reports = [forensic_reports]
 

From 21af33687c80dacab3df31d43e0c0ccab81b5ec4 Mon Sep 17 00:00:00 2001
From: Sean Whalen <whalenster@gmail.com>
Date: Tue, 9 Oct 2018 20:35:45 -0400
Subject: [PATCH 2/2] Fix module logging

---
 parsedmarc/cli.py     | 5 ++++-
 parsedmarc/elastic.py | 1 -
 parsedmarc/splunk.py  | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/parsedmarc/cli.py b/parsedmarc/cli.py
index 7be74b5..f7b0086 100644
--- a/parsedmarc/cli.py
+++ b/parsedmarc/cli.py
@@ -12,10 +12,13 @@ import json
 
 from elasticsearch.exceptions import ElasticsearchException
 
-from parsedmarc import logger, IMAPError, get_dmarc_reports_from_inbox, \
+from parsedmarc import IMAPError, get_dmarc_reports_from_inbox, \
     parse_report_file, elastic, splunk, save_output, watch_inbox, \
     email_results, SMTPError, ParserError, __version__
 
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.WARNING)
+
 
 def _main():
     """Called when the module is executed"""
diff --git a/parsedmarc/elastic.py b/parsedmarc/elastic.py
index 1a781ed..462cd22 100644
--- a/parsedmarc/elastic.py
+++ b/parsedmarc/elastic.py
@@ -9,7 +9,6 @@ from elasticsearch_dsl import connections, Object, Document, Index, Nested, \
     InnerDoc, Integer, Text, Boolean, DateRange, Ip, Date
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.WARNING)
 
 
 class _PolicyOverride(InnerDoc):
diff --git a/parsedmarc/splunk.py b/parsedmarc/splunk.py
index 1861897..2c00f74 100644
--- a/parsedmarc/splunk.py
+++ b/parsedmarc/splunk.py
@@ -11,7 +11,6 @@ from parsedmarc import __version__, human_timestamp_to_timestamp
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.WARNING)
 
 
 class SplunkError(RuntimeError):