From a3d82e2ab9174d088f883120a61b967fe0543bf7 Mon Sep 17 00:00:00 2001
From: Steven Hiscocks <steven@hiscocks.me.uk>
Date: Wed, 10 Apr 2013 21:33:55 +0100
Subject: [PATCH] ENH: fail2ban logging uses __name__ for logger names

---
 bin/fail2ban-testcases             |  2 +-
 fail2ban/client/actionreader.py    |  2 +-
 fail2ban/client/beautifier.py      |  2 +-
 fail2ban/client/configparserinc.py |  2 +-
 fail2ban/client/configreader.py    |  2 +-
 fail2ban/client/configurator.py    |  2 +-
 fail2ban/client/fail2banreader.py  |  2 +-
 fail2ban/client/filterreader.py    |  2 +-
 fail2ban/client/jailreader.py      |  2 +-
 fail2ban/client/jailsreader.py     |  2 +-
 fail2ban/server/action.py          |  2 +-
 fail2ban/server/actions.py         |  2 +-
 fail2ban/server/asyncserver.py     |  2 +-
 fail2ban/server/banmanager.py      |  2 +-
 fail2ban/server/datedetector.py    |  2 +-
 fail2ban/server/datetemplate.py    |  2 +-
 fail2ban/server/faildata.py        |  2 +-
 fail2ban/server/failmanager.py     |  2 +-
 fail2ban/server/filter.py          |  2 +-
 fail2ban/server/filtergamin.py     |  2 +-
 fail2ban/server/filterpoll.py      |  2 +-
 fail2ban/server/filterpyinotify.py |  2 +-
 fail2ban/server/jail.py            |  2 +-
 fail2ban/server/jailthread.py      |  2 +-
 fail2ban/server/server.py          | 11 ++++++-----
 fail2ban/server/ticket.py          |  2 +-
 fail2ban/server/transmitter.py     |  2 +-
 27 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/bin/fail2ban-testcases b/bin/fail2ban-testcases
index 68a31786..d276be1d 100755
--- a/bin/fail2ban-testcases
+++ b/bin/fail2ban-testcases
@@ -109,7 +109,7 @@ else:
 
 # Custom log format for the verbose tests runs
 if verbosity > 1: # pragma: no cover
-	stdout.setFormatter(Formatter(' %(asctime)-15s %(thread)s' + fmt))
+	stdout.setFormatter(Formatter(' %(asctime)-15s %(thread)s %(name)s' + fmt))
 else: # pragma: no cover
 	# just prefix with the space
 	stdout.setFormatter(Formatter(fmt))
diff --git a/fail2ban/client/actionreader.py b/fail2ban/client/actionreader.py
index 9ad1ef28..787a41c7 100644
--- a/fail2ban/client/actionreader.py
+++ b/fail2ban/client/actionreader.py
@@ -31,7 +31,7 @@ import logging
 from configreader import ConfigReader
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.client.config")
+logSys = logging.getLogger(__name__)
 
 class ActionReader(ConfigReader):
 	
diff --git a/fail2ban/client/beautifier.py b/fail2ban/client/beautifier.py
index 1403bb08..fe58ccf3 100644
--- a/fail2ban/client/beautifier.py
+++ b/fail2ban/client/beautifier.py
@@ -26,7 +26,7 @@ import logging
 from fail2ban.exceptions import UnknownJailException, DuplicateJailException
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.client.config")
+logSys = logging.getLogger(__name__)
 
 ##
 # Beautify the output of the client.
diff --git a/fail2ban/client/configparserinc.py b/fail2ban/client/configparserinc.py
index 7ac8b4a5..0ffa0728 100644
--- a/fail2ban/client/configparserinc.py
+++ b/fail2ban/client/configparserinc.py
@@ -31,7 +31,7 @@ import logging, os
 from ConfigParser import SafeConfigParser
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.client.config")
+logSys = logging.getLogger(__name__)
 
 class SafeConfigParserWithIncludes(SafeConfigParser):
 	"""
diff --git a/fail2ban/client/configreader.py b/fail2ban/client/configreader.py
index 243c843c..6f1e7740 100644
--- a/fail2ban/client/configreader.py
+++ b/fail2ban/client/configreader.py
@@ -32,7 +32,7 @@ from configparserinc import SafeConfigParserWithIncludes
 from ConfigParser import NoOptionError, NoSectionError
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.client.config")
+logSys = logging.getLogger(__name__)
 
 class ConfigReader(SafeConfigParserWithIncludes):
 
diff --git a/fail2ban/client/configurator.py b/fail2ban/client/configurator.py
index 2097fd54..23ee88c6 100644
--- a/fail2ban/client/configurator.py
+++ b/fail2ban/client/configurator.py
@@ -33,7 +33,7 @@ from fail2banreader import Fail2banReader
 from jailsreader import JailsReader
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.client.config")
+logSys = logging.getLogger(__name__)
 
 class Configurator:
 	
diff --git a/fail2ban/client/fail2banreader.py b/fail2ban/client/fail2banreader.py
index c8f42976..e388f9ae 100644
--- a/fail2ban/client/fail2banreader.py
+++ b/fail2ban/client/fail2banreader.py
@@ -31,7 +31,7 @@ import logging
 from configreader import ConfigReader
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.client.config")
+logSys = logging.getLogger(__name__)
 
 class Fail2banReader(ConfigReader):
 	
diff --git a/fail2ban/client/filterreader.py b/fail2ban/client/filterreader.py
index 7dba3579..8b00446e 100644
--- a/fail2ban/client/filterreader.py
+++ b/fail2ban/client/filterreader.py
@@ -31,7 +31,7 @@ import logging
 from configreader import ConfigReader
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.client.config")
+logSys = logging.getLogger(__name__)
 
 class FilterReader(ConfigReader):
 	
diff --git a/fail2ban/client/jailreader.py b/fail2ban/client/jailreader.py
index 55e512f3..e4175f4f 100644
--- a/fail2ban/client/jailreader.py
+++ b/fail2ban/client/jailreader.py
@@ -34,7 +34,7 @@ from filterreader import FilterReader
 from actionreader import ActionReader
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.client.config")
+logSys = logging.getLogger(__name__)
 
 class JailReader(ConfigReader):
 	
diff --git a/fail2ban/client/jailsreader.py b/fail2ban/client/jailsreader.py
index 91e178d6..345a225f 100644
--- a/fail2ban/client/jailsreader.py
+++ b/fail2ban/client/jailsreader.py
@@ -32,7 +32,7 @@ from configreader import ConfigReader
 from jailreader import JailReader
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.client.config")
+logSys = logging.getLogger(__name__)
 
 class JailsReader(ConfigReader):
 	
diff --git a/fail2ban/server/action.py b/fail2ban/server/action.py
index 5fde3ae1..d2a8cfde 100644
--- a/fail2ban/server/action.py
+++ b/fail2ban/server/action.py
@@ -32,7 +32,7 @@ import threading
 #from subprocess import call
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.actions.action")
+logSys = logging.getLogger(__name__)
 
 # Create a lock for running system commands
 _cmd_lock = threading.Lock()
diff --git a/fail2ban/server/actions.py b/fail2ban/server/actions.py
index ddcc83d6..c0373239 100644
--- a/fail2ban/server/actions.py
+++ b/fail2ban/server/actions.py
@@ -34,7 +34,7 @@ from mytime import MyTime
 import time, logging
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.actions")
+logSys = logging.getLogger(__name__)
 
 ##
 # Execute commands.
diff --git a/fail2ban/server/asyncserver.py b/fail2ban/server/asyncserver.py
index d5fb791c..5f729e11 100644
--- a/fail2ban/server/asyncserver.py
+++ b/fail2ban/server/asyncserver.py
@@ -33,7 +33,7 @@ import asyncore, asynchat, socket, os, logging, sys, traceback
 from fail2ban import helpers
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.server")
+logSys = logging.getLogger(__name__)
 
 ##
 # Request handler class.
diff --git a/fail2ban/server/banmanager.py b/fail2ban/server/banmanager.py
index 1143f791..9c81f252 100644
--- a/fail2ban/server/banmanager.py
+++ b/fail2ban/server/banmanager.py
@@ -33,7 +33,7 @@ from mytime import MyTime
 import logging
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.action")
+logSys = logging.getLogger(__name__)
 
 ##
 # Banning Manager.
diff --git a/fail2ban/server/datedetector.py b/fail2ban/server/datedetector.py
index c013d551..2f57294a 100644
--- a/fail2ban/server/datedetector.py
+++ b/fail2ban/server/datedetector.py
@@ -33,7 +33,7 @@ from datetemplate import DateStrptime, DateTai64n, DateEpoch, DateISO8601
 from threading import Lock
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.filter.datedetector")
+logSys = logging.getLogger(__name__)
 
 class DateDetector:
 	
diff --git a/fail2ban/server/datetemplate.py b/fail2ban/server/datetemplate.py
index 51b8bb1e..c75a02f2 100644
--- a/fail2ban/server/datetemplate.py
+++ b/fail2ban/server/datetemplate.py
@@ -33,7 +33,7 @@ from mytime import MyTime
 import iso8601
 
 import logging
-logSys = logging.getLogger("fail2ban.datetemplate")
+logSys = logging.getLogger(__name__)
 
 
 class DateTemplate:
diff --git a/fail2ban/server/faildata.py b/fail2ban/server/faildata.py
index 1f0bda04..efda51e1 100644
--- a/fail2ban/server/faildata.py
+++ b/fail2ban/server/faildata.py
@@ -30,7 +30,7 @@ __license__ = "GPL"
 import logging
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban")
+logSys = logging.getLogger(__name__)
 
 class FailData:
 	
diff --git a/fail2ban/server/failmanager.py b/fail2ban/server/failmanager.py
index 02f16ce3..60e71c7b 100644
--- a/fail2ban/server/failmanager.py
+++ b/fail2ban/server/failmanager.py
@@ -33,7 +33,7 @@ from threading import Lock
 import logging
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.filter")
+logSys = logging.getLogger(__name__)
 
 class FailManager:
 	
diff --git a/fail2ban/server/filter.py b/fail2ban/server/filter.py
index 4fa22bd4..fe990578 100644
--- a/fail2ban/server/filter.py
+++ b/fail2ban/server/filter.py
@@ -38,7 +38,7 @@ from failregex import FailRegex, Regex, RegexException
 import logging, re, os, fcntl, time
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.filter")
+logSys = logging.getLogger(__name__)
 
 ##
 # Log reader class.
diff --git a/fail2ban/server/filtergamin.py b/fail2ban/server/filtergamin.py
index cff5aa54..e324b677 100644
--- a/fail2ban/server/filtergamin.py
+++ b/fail2ban/server/filtergamin.py
@@ -30,7 +30,7 @@ from mytime import MyTime
 import time, logging, gamin
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.filter")
+logSys = logging.getLogger(__name__)
 
 ##
 # Log reader class.
diff --git a/fail2ban/server/filterpoll.py b/fail2ban/server/filterpoll.py
index f0e23ac1..3217e958 100644
--- a/fail2ban/server/filterpoll.py
+++ b/fail2ban/server/filterpoll.py
@@ -33,7 +33,7 @@ from mytime import MyTime
 import time, logging, os
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.filter")
+logSys = logging.getLogger(__name__)
 
 ##
 # Log reader class.
diff --git a/fail2ban/server/filterpyinotify.py b/fail2ban/server/filterpyinotify.py
index e86498b0..786c6dfa 100644
--- a/fail2ban/server/filterpyinotify.py
+++ b/fail2ban/server/filterpyinotify.py
@@ -38,7 +38,7 @@ if not hasattr(pyinotify, '__version__') \
 from os.path import dirname, sep as pathsep
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.filter")
+logSys = logging.getLogger(__name__)
 
 ##
 # Log reader class.
diff --git a/fail2ban/server/jail.py b/fail2ban/server/jail.py
index dee64e7f..fa2a8fa5 100644
--- a/fail2ban/server/jail.py
+++ b/fail2ban/server/jail.py
@@ -28,7 +28,7 @@ import Queue, logging
 from actions import Actions
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.jail")
+logSys = logging.getLogger(__name__)
 
 class Jail:
 
diff --git a/fail2ban/server/jailthread.py b/fail2ban/server/jailthread.py
index 343ea7e2..98fd4066 100644
--- a/fail2ban/server/jailthread.py
+++ b/fail2ban/server/jailthread.py
@@ -31,7 +31,7 @@ from threading import Thread
 import logging
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.server")
+logSys = logging.getLogger(__name__)
 
 class JailThread(Thread):
 	
diff --git a/fail2ban/server/server.py b/fail2ban/server/server.py
index 8038a0c1..a5d2d5d2 100644
--- a/fail2ban/server/server.py
+++ b/fail2ban/server/server.py
@@ -36,7 +36,7 @@ from fail2ban import version
 import logging, logging.handlers, sys, os, signal
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.server")
+logSys = logging.getLogger(__name__)
 
 class Server:
 	
@@ -329,7 +329,7 @@ class Server:
 				logLevel = logging.WARNING
 			elif value == 3:
 				logLevel = logging.INFO
-			logging.getLogger("fail2ban").setLevel(logLevel)
+			logging.getLogger(__name__).parent.parent.setLevel(logLevel)
 		finally:
 			self.__loggingLock.release()
 	
@@ -378,9 +378,10 @@ class Server:
 					return False
 			# Removes previous handlers -- in reverse order since removeHandler
 			# alter the list in-place and that can confuses the iterable
-			for handler in logging.getLogger("fail2ban").handlers[::-1]:
+			logger = logging.getLogger(__name__).parent.parent
+			for handler in logger.handlers[::-1]:
 				# Remove the handler.
-				logging.getLogger("fail2ban").removeHandler(handler)
+				logger.removeHandler(handler)
 				# And try to close -- it might be closed already
 				try:
 					handler.flush()
@@ -392,7 +393,7 @@ class Server:
 					# with older Pythons -- seems to be safe to ignore there
 			# tell the handler to use this format
 			hdlr.setFormatter(formatter)
-			logging.getLogger("fail2ban").addHandler(hdlr)
+			logger.addHandler(hdlr)
 			# Does not display this message at startup.
 			if not self.__logTarget == None:
 				logSys.info("Changed logging target to %s for Fail2ban v%s" %
diff --git a/fail2ban/server/ticket.py b/fail2ban/server/ticket.py
index c03761c1..95643d15 100644
--- a/fail2ban/server/ticket.py
+++ b/fail2ban/server/ticket.py
@@ -30,7 +30,7 @@ __license__ = "GPL"
 import logging
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban")
+logSys = logging.getLogger(__name__)
 
 class Ticket:
 	
diff --git a/fail2ban/server/transmitter.py b/fail2ban/server/transmitter.py
index 010be268..d209441d 100644
--- a/fail2ban/server/transmitter.py
+++ b/fail2ban/server/transmitter.py
@@ -30,7 +30,7 @@ __license__ = "GPL"
 import logging, time
 
 # Gets the instance of the logger.
-logSys = logging.getLogger("fail2ban.comm")
+logSys = logging.getLogger(__name__)
 
 class Transmitter: