BF: general Exception catch was excessive. Only IOError and OSError a…

…re possible and has different meanings
fail2ban · Mar 10, 2013 · c8c7b0b · c8c7b0b
1 parent 6e77427
commit c8c7b0b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/server/filter.py b/server/filter.py
@@ -477,10 +477,15 @@ def getFailures(self, filename):
 		# Try to open log file.
 		try:
 			container.open()
-		except Exception, e:
+		# see http://python.org/dev/peps/pep-3151/
+		except IOError, e:
 			logSys.error("Unable to open %s" % filename)
 			logSys.exception(e)
 			return False
+		except OSError, e: # pragma: no cover - requires race condition to tigger this
+			logSys.error("Error opening %s" % filename)
+			logSys.exception(e)
+			return False
 
 		while True:
 			line = container.readline()