summaryrefslogtreecommitdiff
path: root/swift/common/middleware/catch_errors.py
diff options
context:
space:
mode:
authorClay Gerrard <clay.gerrard@rackspace.com>2011-01-07 21:17:29 +0000
committerTarmac <>2011-01-07 21:17:29 +0000
commitff0e62d914d79c02f379992a0afb14c46c617711 (patch)
treeb25450e57ef8b407cee7b6336272f41de6631ab7 /swift/common/middleware/catch_errors.py
parent954dcf7c996d48e09c387618db8c7131cf77860b (diff)
parent30fd2dd0f229d95b53d6efaff4b2792d5f49373b (diff)
downloadswift-ff0e62d914d79c02f379992a0afb14c46c617711.tar.gz
reworked tnx logging
Diffstat (limited to 'swift/common/middleware/catch_errors.py')
-rw-r--r--swift/common/middleware/catch_errors.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/swift/common/middleware/catch_errors.py b/swift/common/middleware/catch_errors.py
index e2287fdbe..10d861419 100644
--- a/swift/common/middleware/catch_errors.py
+++ b/swift/common/middleware/catch_errors.py
@@ -26,7 +26,11 @@ class CatchErrorMiddleware(object):
def __init__(self, app, conf):
self.app = app
- self.logger = get_logger(conf)
+ # if the application already has a logger we should use that one
+ self.logger = getattr(app, 'logger', None)
+ if not self.logger:
+ # and only call get_logger if we have to
+ self.logger = get_logger(conf)
def __call__(self, env, start_response):
try: