Merge branch 'master' of https://github.com/domainaware/parsedmarc

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]

parsedmarc/cli.py

@@ -16,6 +16,9 @@ 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)
+
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.WARNING)

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):

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):
@@ -61,6 +60,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 +122,7 @@ class HECClient(object):
             to save in Splunk
 
         """
+        logger.debug("Saving forensic reports to Splunk")
         if type(forensic_reports) == dict:
             forensic_reports = [forensic_reports]