Merge branch '0.10' into 0.11

7 years ago · 0a4a76c4c4
parent c50875ccf6 9d5f20aab2
commit 0a4a76c4c4
1 changed files with 5 additions and 2 deletions
--- a/fail2ban/server/filterpyinotify.py
+++ b/fail2ban/server/filterpyinotify.py
@ -374,8 +374,11 @@ class FilterPyinotify(FileFilter):
 	def stop(self):
 		# stop filter thread:
 		super(FilterPyinotify, self).stop()
-		if self.__notifier: # stop the notifier
-			self.__notifier.stop()
+		try:
+			if self.__notifier: # stop the notifier
+				self.__notifier.stop()
+		except AttributeError: # pragma: no cover
+			if self.__notifier: raise

 	##
 	# Wait for exit with cleanup.