Merge branch '0.10' into 0.11

fail2ban · Jan 19, 2018 · 0a4a76c · 0a4a76c
2 parents c50875c + 9d5f20a
commit 0a4a76c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/fail2ban/server/filterpyinotify.py b/fail2ban/server/filterpyinotify.py
@@ -374,8 +374,11 @@ def __check_events():
 	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.