From 2245ff5b412e0a9cbbc6db39a93c16006e69f6a9 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 10 Feb 2012 21:59:26 -0500 Subject: [PATCH] ENH: rudimentary __repr__ for Filter and Jail + moved usedns into set method otherwise usedns is way too noisy, especially within fail2ban-regex --- server/filter.py | 7 +++++-- server/jail.py | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/filter.py b/server/filter.py index 91f20325..53777766 100644 --- a/server/filter.py +++ b/server/filter.py @@ -73,9 +73,12 @@ class Filter(JailThread): self.dateDetector = DateDetector() self.dateDetector.addDefaultTemplate() - logSys.debug("Created Filter") + logSys.debug("Created %s" % self) + def __repr__(self): + return "%s(%r)" % (self.__class__.__name__, self.jail) + ## # Add a regular expression which matches the failure. # @@ -146,6 +149,7 @@ class Filter(JailThread): # @param value the usedns mode def setUseDns(self, value): + logSys.debug("Setting usedns = %s for %s" % (value, self)) self.__useDns = value ## @@ -586,7 +590,6 @@ class DNSUtils: if useDns == "no": return None else: - logSys.debug("usedns = %s" % useDns) ipList = list() # Search for plain IP plainIP = DNSUtils.searchIP(text) diff --git a/server/jail.py b/server/jail.py index 53048b98..4ab83db4 100644 --- a/server/jail.py +++ b/server/jail.py @@ -42,6 +42,9 @@ class Jail: logSys.info("Creating new jail '%s'" % self.__name) self._setBackend(backend) + def __repr__(self): + return "%s(%r)" % (self.__class__.__name__, self.__name) + def _setBackend(self, backend): backend = backend.lower() # to assure consistent matching