From a1898b18401af16bc045dc1d27b18167246e58bd Mon Sep 17 00:00:00 2001 From: Lee Clemens Date: Thu, 12 Jan 2012 00:29:36 -0500 Subject: [PATCH 1/4] Fixed and added error message if no backends initialized. INVALID COMMAND is printed when RuntimeError is raised, so we don't get to see the error's message --- server/jail.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/jail.py b/server/jail.py index 8e249bff..4e105f8e 100644 --- a/server/jail.py +++ b/server/jail.py @@ -68,8 +68,11 @@ class Jail: except ImportError, e: logSys.debug( "Backend %r failed to initialize due to %s" % (b, e)) + # log error since runtime error message isn't printed, INVALID COMMAND + logSys.error( + "Failed to initialize any backend for jail %s" % self.__name) raise RuntimeError( - "We should have initialized at least 'polling' backend") + "Failed to initialize any backend for jail %s" % self.__name) def _initPolling(self): From 642d9afb9af5aef7e2dcb6edbe7b91e28ceecf2e Mon Sep 17 00:00:00 2001 From: Lee Clemens Date: Thu, 12 Jan 2012 00:32:37 -0500 Subject: [PATCH 2/4] Reformated printing of jail's name to be consistent with init's info messages --- server/jail.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/jail.py b/server/jail.py index 4e105f8e..61545791 100644 --- a/server/jail.py +++ b/server/jail.py @@ -70,9 +70,9 @@ class Jail: "Backend %r failed to initialize due to %s" % (b, e)) # log error since runtime error message isn't printed, INVALID COMMAND logSys.error( - "Failed to initialize any backend for jail %s" % self.__name) + "Failed to initialize any backend for Jail %r" % self.__name) raise RuntimeError( - "Failed to initialize any backend for jail %s" % self.__name) + "Failed to initialize any backend for jail %r" % self.__name) def _initPolling(self): From 3282f8665173dfe4d37b4d1364ade5a7054d0733 Mon Sep 17 00:00:00 2001 From: Lee Clemens Date: Thu, 12 Jan 2012 00:33:12 -0500 Subject: [PATCH 3/4] capitalized Jail --- server/jail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/jail.py b/server/jail.py index 61545791..f5fd3b04 100644 --- a/server/jail.py +++ b/server/jail.py @@ -72,7 +72,7 @@ class Jail: logSys.error( "Failed to initialize any backend for Jail %r" % self.__name) raise RuntimeError( - "Failed to initialize any backend for jail %r" % self.__name) + "Failed to initialize any backend for Jail %r" % self.__name) def _initPolling(self): From e7dce7cc5a6c4b62f2133e7e5985ebfe4eadf49c Mon Sep 17 00:00:00 2001 From: Lee Clemens Date: Thu, 12 Jan 2012 01:05:51 -0500 Subject: [PATCH 4/4] BF: Added logging above ValueError, since only INVALID COMMAND is printed by calling method --- server/jail.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/jail.py b/server/jail.py index f5fd3b04..53048b98 100644 --- a/server/jail.py +++ b/server/jail.py @@ -49,8 +49,10 @@ class Jail: if backend != 'auto': # we have got strict specification of the backend to use if not (backend in self._BACKENDS): + logSys.error("Unknown backend %s. Must be among %s or 'auto'" + % (backend, backends)) raise ValueError("Unknown backend %s. Must be among %s or 'auto'" - % (backend, backends)) + % (backend, backends)) # so explore starting from it till the 'end' backends = backends[backends.index(backend):]