[#6553] fix taskd error logging (again)
* don't re-raise an error after we've logged it already
* commit [2b7892] was incorrect in saying that errormiddleware wasn't used for taskd,
only StatusCodeRedirect was bypassed. Now we *do* bypass error middleware also
diff --git a/Allura/allura/config/middleware.py b/Allura/allura/config/middleware.py
index bd73dce..1e9b0c7 100644
--- a/Allura/allura/config/middleware.py
+++ b/Allura/allura/config/middleware.py
@@ -100,7 +100,7 @@
# Configure EW variable provider
ew.render.TemplateEngine.register_variable_provider(get_tg_vars)
-
+
# Set FormEncode language to english, as we don't support any other locales
formencode.api.set_stdtranslation(domain='FormEncode', languages=['en'])
@@ -161,16 +161,16 @@
# streaming=true ensures they won't be cleaned up till
# the WSGI application's iterator is exhausted
app = RegistryManager(app, streaming=True)
- # Converts exceptions to HTTP errors, shows traceback in debug mode
- tg.error.footer_html = '<!-- %s %s -->' # don't use TG footer with extra CSS & images that take time to load
- app = tg.error.ErrorHandler(app, global_conf, **config['pylons.errorware'])
# Make sure that the wsgi.scheme is set appropriately when we
# have the funky HTTP_X_SFINC_SSL environ var
if asbool(app_conf.get('auth.method', 'local')=='sfx'):
app = set_scheme_middleware(app)
- # Redirect some status codes to /error/document
+ # "task" wsgi would get a 2nd request to /error/document if we used this middleware
if config.get('override_root') != 'task':
- # "task" wsgi would get a 2nd request to /error/document if we used this middleware
+ # Converts exceptions to HTTP errors, shows traceback in debug mode
+ tg.error.footer_html = '<!-- %s %s -->' # don't use TG footer with extra CSS & images that take time to load
+ app = tg.error.ErrorHandler(app, global_conf, **config['pylons.errorware'])
+ # Redirect some status codes to /error/document
if asbool(config['debug']):
app = StatusCodeRedirect(app, base_config.handle_status_codes)
else:
diff --git a/Allura/allura/model/monq_model.py b/Allura/allura/model/monq_model.py
index 9fa0064..3163ea5 100644
--- a/Allura/allura/model/monq_model.py
+++ b/Allura/allura/model/monq_model.py
@@ -264,7 +264,6 @@
log.error(self.result)
else:
self.result = traceback.format_exc()
- raise
finally:
self.time_stop = datetime.utcnow()
session(self).flush(self)
