Browse Source

ENH: use_dns - removed debugging statements

pull/27/head
Lee Clemens 13 years ago
parent
commit
4d30c52907
  1. 1
      client/jailreader.py
  2. 7
      server/filter.py
  3. 4
      server/server.py

1
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]])

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

4
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()

Loading…
Cancel
Save