From 50040f5655cb9643b88814eda8ec3a5574f632bc Mon Sep 17 00:00:00 2001 From: Ivan Kolodyazhny Date: Fri, 23 Jun 2017 12:56:14 +0300 Subject: [PATCH] Use exception.CinderException instead of Exception This patch also changes exception message to more user-friendly one. Of course, 'die' is very funny but doesn't help during debug. Change-Id: I5e859ac69c05606428d0bcacb604bbd6b40d69fc --- cinder/db/sqlalchemy/api.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py index 7a08b750695..0fa4d8c1291 100644 --- a/cinder/db/sqlalchemy/api.py +++ b/cinder/db/sqlalchemy/api.py @@ -121,9 +121,8 @@ def get_backend(): def is_admin_context(context): """Indicates if the request context is an administrator.""" if not context: - LOG.warning('Use of empty request context is deprecated', - DeprecationWarning) - raise Exception('die') + raise exception.CinderException( + 'Use of empty request context is deprecated') return context.is_admin