# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-03-02 09:28:28
# Node ID cf3f95ff106bb1c4fea27594da3e319320de3195
# Parent  4a48578338c0d0b173bf19c50f883f22cd7583f6

error-middleware: read title from cached rhodecode object.

- reading from settings inside error handler can cause error hiding when
error_handler was caused by database error. Db transaction is set as rollback, and re-trying to
read the settings can hide the real error.

diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -219,14 +219,10 @@ def add_pylons_compat_data(registry, glo
 
 
 def error_handler(exception, request):
-    from rhodecode.model.settings import SettingsModel
+    import rhodecode
     from rhodecode.lib.utils2 import AttributeDict
 
-    try:
-        rc_config = SettingsModel().get_all_settings()
-    except Exception:
-        log.exception('failed to fetch settings')
-        rc_config = {}
+    rhodecode_title = rhodecode.CONFIG.get('rhodecode_title') or 'RhodeCode'
 
     base_response = HTTPInternalServerError()
     # prefer original exception for the response since it may have headers set
@@ -251,7 +247,7 @@ def error_handler(exception, request):
         request.route_url('rhodecode_support')
     )
     c.redirect_time = 0
-    c.rhodecode_name = rc_config.get('rhodecode_title', '')
+    c.rhodecode_name = rhodecode_title
     if not c.rhodecode_name:
         c.rhodecode_name = 'Rhodecode'