From c8c7b0b9845f240b0e1ecaabc84def4c0a74b86e Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sun, 10 Mar 2013 15:29:27 +1100
Subject: [PATCH] BF: general Exception catch was excessive. Only IOError and
 OSError are possible and has different meanings

---
 server/filter.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/filter.py b/server/filter.py
index 5b2b85e0..ceda1377 100644
--- a/server/filter.py
+++ b/server/filter.py
@@ -477,10 +477,15 @@ class FileFilter(Filter):
 		# 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()