From 8af3ffb332a3e0aecabe09e97c6805169f72421e Mon Sep 17 00:00:00 2001 From: Steven Hiscocks Date: Fri, 10 May 2013 16:54:53 +0100 Subject: [PATCH] BF: Fix for filterpoll incorrectly checking for jailless state --- server/filterpoll.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/filterpoll.py b/server/filterpoll.py index 8a6a88e7..20cde0ca 100644 --- a/server/filterpoll.py +++ b/server/filterpoll.py @@ -104,7 +104,8 @@ class FilterPoll(FileFilter): time.sleep(self.getSleepTime()) else: time.sleep(self.getSleepTime()) - logSys.debug((self.jail and self.jail.getName() or "jailless") + + logSys.debug( + (self.jail is not None and self.jail.getName() or "jailless") + " filter terminated") return True @@ -130,7 +131,7 @@ class FilterPoll(FileFilter): self.__file404Cnt[filename] += 1 if self.__file404Cnt[filename] > 2: logSys.warn("Too many errors. Setting the jail idle") - if self.jail: + if self.jail is not None: self.jail.setIdle(True) else: logSys.warn("No jail is assigned to %s" % self)