From 4d30c5290725b7d92b0a8f49c1eb5a6a2d12b32e Mon Sep 17 00:00:00 2001 From: Lee Clemens Date: Mon, 9 Jan 2012 23:07:59 -0500 Subject: [PATCH] ENH: use_dns - removed debugging statements --- client/jailreader.py | 1 - server/filter.py | 7 +------ server/server.py | 4 +--- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/client/jailreader.py b/client/jailreader.py index 618320c2..ccda4739 100644 --- a/client/jailreader.py +++ b/client/jailreader.py @@ -124,7 +124,6 @@ class JailReader(ConfigReader): elif opt == "bantime": stream.append(["set", self.__name, "bantime", self.__opts[opt]]) elif opt == "use_dns": - logSys.debug("USE_DNS: In jailreader.convert") stream.append(["set", self.__name, "use_dns", self.__opts[opt]]) elif opt == "failregex": stream.append(["set", self.__name, "addfailregex", self.__opts[opt]]) diff --git a/server/filter.py b/server/filter.py index a08ba640..da63ec7f 100644 --- a/server/filter.py +++ b/server/filter.py @@ -147,14 +147,12 @@ class Filter(JailThread): def setUseDns(self, value): self.__useDns = value - logSys.info("USE_DNS: Set use_dns = %s" % value) ## # Get the use_dns mode # @return the use_dns mode def getUseDns(self): - logSys.debug("USE_DNS: Get use_dns = %s" % self.__useDns) return self.__useDns ## @@ -585,13 +583,10 @@ class DNSUtils: def textToIp(text, useDns): """ Return the IP of DNS found in a given text. """ - logSys.debug("USE_DNS: Checking rDNS: %s" % text) - logSys.debug("USE_DNS: DNS use_dns == %s" % useDns) if useDns == "no": - logSys.debug("USE_DNS: use_dns == no") return None else: - logSys.debug("USE_DNS: use_dns != no") + logSys.debug("use_dns = %s" % useDns) ipList = list() # Search for plain IP plainIP = DNSUtils.searchIP(text) diff --git a/server/server.py b/server/server.py index c7537743..84e443b7 100644 --- a/server/server.py +++ b/server/server.py @@ -205,16 +205,14 @@ class Server: return self.__jails.getFilter(name).getIgnoreRegex() def setUseDns(self, name, value): - logSys.debug("USE_DNS: in server.setUseDns: %s" % value) self.__jails.getFilter(name).setUseDns(value) def getUseDns(self, name): - logSys.debug("USE_DNS: in server.getUseDns: %s" % name) return self.__jails.getFilter(name).getUseDns() def setMaxRetry(self, name, value): self.__jails.getFilter(name).setMaxRetry(value) - + n def getMaxRetry(self, name): return self.__jails.getFilter(name).getMaxRetry()