summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-05-31 16:12:58 +0000
committerGerrit Code Review <review@openstack.org>2012-05-31 16:12:58 +0000
commit9ff902bddbf18d924e0ccc9ba0dc3bbd4c057faf (patch)
tree81254649beeeaa9183fb7b4125797ef529491e2e
parent541052688f3dda64bc2cceb52ffddb50968322d9 (diff)
parenta390798d4e5956e94060a9c45a1f7be2bdb9ccbd (diff)
downloadnova-9ff902bddbf18d924e0ccc9ba0dc3bbd4c057faf.tar.gz
nova-9ff902bddbf18d924e0ccc9ba0dc3bbd4c057faf.tar.xz
nova-9ff902bddbf18d924e0ccc9ba0dc3bbd4c057faf.zip
Merge "Make sure an exception is logged when config file isn't found"
-rw-r--r--nova/exception.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/nova/exception.py b/nova/exception.py
index 1e1818e7d..3f3988d2d 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -424,10 +424,6 @@ class NotFound(NovaException):
code = 404
-class FlagNotSet(NotFound):
- message = _("Required flag %(flag)s not set.")
-
-
class VolumeNotFound(NotFound):
message = _("Volume %(volume_id)s could not be found.")
@@ -941,11 +937,13 @@ class MalformedRequestBody(NovaException):
message = _("Malformed message body: %(reason)s")
-class ConfigNotFound(NotFound):
+# NOTE(johannes): NotFound should only be used when a 404 error is
+# appropriate to be returned
+class ConfigNotFound(NovaException):
message = _("Could not find config at %(path)s")
-class PasteAppNotFound(NotFound):
+class PasteAppNotFound(NovaException):
message = _("Could not load paste app '%(name)s' from %(path)s")