kallithea Changeset - 9adc0c1d9a87

Changeset - 9adc0c1d9a87

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 15 years ago 2010-12-29 12:18:49
marcin@python-works.com

Added optional cache into get_application settings

1 file changed with 5 insertions and 4 deletions:

rhodecode/model/settings.py

0 comments (0 inline, 0 general)

rhodecode/model/settings.py

➞

Show inline comments

@@ @@ -24,57 +24,58 @@ Model for RhodeCode @@
 """
 from rhodecode.lib import helpers as h
 from rhodecode.model import BaseModel
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import  RhodeCodeSettings
 from sqlalchemy.orm import joinedload
 import logging
 log = logging.getLogger(__name__)
 class SettingsModel(BaseModel):
     """
     Settings model
     """
     def get(self, settings_key, cache=False):
         r = self.sa.query(RhodeCodeSettings)\
             .filter(RhodeCodeSettings.app_settings_name == settings_key).scalar()
         if cache:
             r = r.options(FromCache("sql_cache_short",
                                           "get_setting_%s" % settings_key))
         return r
     def get_app_settings(self):
+    def get_app_settings(self, cache=False):
         """Get's config from database, each config key is prefixed with
         'rhodecode_' prefix, than global pylons config is updated with such
         keys
         """
         ret = self.sa.query(RhodeCodeSettings)\
             .options(FromCache("sql_cache_short",
                            "get_hg_settings")).all()
         ret = self.sa.query(RhodeCodeSettings)
         if cache:
             ret = ret.options(FromCache("sql_cache_short", "get_hg_settings"))
         if not ret:
             raise Exception('Could not get application settings !')
         settings = {}
         for each in ret:
             settings['rhodecode_' + each.app_settings_name] = each.app_settings_value
         return settings
     def get_ldap_settings(self):
         """
         Returns ldap settings from database
         :returns:
         ldap_active
         ldap_host
         ldap_port
         ldap_ldaps
         ldap_dn_user
         ldap_dn_pass
         ldap_base_dn
         """
         r = self.sa.query(RhodeCodeSettings)\
                 .filter(RhodeCodeSettings.app_settings_name\

0 comments (0 inline, 0 general)