kallithea Changeset - 27d9ca0c8381

Changeset - 27d9ca0c8381

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich (mads) - 6 years ago 2020-04-24 13:17:00
mads@kiilerich.com

Grafted from: 2d7900d45e27

tg: use FullStackApplicationConfigurator instead of deprecated setup_tg_wsgi_app and AppConfig

2 files changed with 8 insertions and 13 deletions:

kallithea/config/app_cfg.py

kallithea/config/application.py

0 comments (0 inline, 0 general)

kallithea/config/app_cfg.py

➞

Show inline comments

@@ @@ -19,44 +19,46 @@ This file complements the .ini file. @@
 import logging
 import os
 import platform
 import sys
 import alembic.config
 import mercurial
 import tg
 from alembic.migration import MigrationContext
 from alembic.script.base import ScriptDirectory
 from sqlalchemy import create_engine
-from tg.configuration import AppConfig
+from tg import FullStackApplicationConfigurator
 import kallithea.lib.locale
 import kallithea.model.base
 import kallithea.model.meta
 from kallithea.lib import celerypylons
 from kallithea.lib.middleware.https_fixup import HttpsFixup
 from kallithea.lib.middleware.permanent_repo_url import PermanentRepoUrl
 from kallithea.lib.middleware.simplegit import SimpleGit
 from kallithea.lib.middleware.simplehg import SimpleHg
 from kallithea.lib.middleware.wrapper import RequestWrapper
 from kallithea.lib.utils import check_git_version, load_rcextensions, set_app_settings, set_indexer_config, set_vcs_config
 from kallithea.lib.utils2 import asbool
 from kallithea.model import db
 log = logging.getLogger(__name__)
 base_config = AppConfig(**{
 base_config = FullStackApplicationConfigurator()
 base_config.update_blueprint({
     'package': kallithea,
     # Rendering Engines Configuration
     'renderers': [
         'json',
         'mako',
     ],
     'default_renderer': 'mako',
     'use_dotted_templatenames': False,
     # Configure Sessions, store data as JSON to avoid pickle security issues
     'session.enabled': True,
@@ @@ -180,13 +182,13 @@ def setup_application(app): @@
     if any(asbool(config.get(x)) for x in ['https_fixup', 'force_https', 'use_htsts']):
         app = HttpsFixup(app, config)
     app = PermanentRepoUrl(app, config)
     # Optional and undocumented wrapper - gives more verbose request/response logging, but has a slight overhead
     if asbool(config.get('use_wsgi_wrapper')):
         app = RequestWrapper(app, config)
     return app
-tg.hooks.register('before_config', setup_application)
+tg.hooks.register('before_wsgi_middlewares', setup_application)

kallithea/config/application.py

➞

Show inline comments

@@ @@ -9,39 +9,32 @@ @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """WSGI middleware initialization for the Kallithea application."""
 from kallithea.config.app_cfg import base_config
 __all__ = ['make_app']
 load_environment = base_config.make_load_environment()
 # Use base_config to setup the necessary PasteDeploy application factory.
 # make_base_app will wrap the TurboGears2 app with all the middleware it needs.
 make_base_app = base_config.setup_tg_wsgi_app(load_environment)
 def make_app(global_conf, full_stack=True, **app_conf):
 def make_app(global_conf, **app_conf):
     """
     Set up Kallithea with the settings found in the PasteDeploy configuration
     file used.
     :param global_conf: The global settings for Kallithea (those
         defined under the ``[DEFAULT]`` section).
     :type global_conf: dict
     :param full_stack: Should the whole TurboGears2 stack be set up?
     :type full_stack: str or bool
     :return: The Kallithea application with all the relevant middleware
         loaded.
     This is the PasteDeploy factory for the Kallithea application.
     ``app_conf`` contains all the application-specific settings (those defined
     under ``[app:main]``.
     """
     assert app_conf.get('sqlalchemy.url')  # must be called with a Kallithea .ini file, which for example must have this config option
     assert global_conf.get('here') and global_conf.get('__file__')  # app config should be initialized the paste way ...
     return make_base_app(global_conf, full_stack=full_stack, **app_conf)
     return base_config.make_wsgi_app(global_conf, app_conf, wrap_app=None)

0 comments (0 inline, 0 general)