kallithea Changeset - e488be112e5e

Changeset - e488be112e5e

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 6 years ago 2020-01-25 20:15:51
mads@kiilerich.com

Grafted from: 9a2ae38dfa8f

config: drop make_app_without_logging - 69704bc113ea made it redundant

4 files changed with 4 insertions and 9 deletions:

kallithea/bin/kallithea_cli_base.py

kallithea/bin/kallithea_cli_db.py

kallithea/config/middleware.py

kallithea/lib/hooks.py

0 comments (0 inline, 0 general)

kallithea/bin/kallithea_cli_base.py

➞

Show inline comments

@@ @@ -72,11 +72,11 @@ def register_command(config_file=False, @@
                 path_to_ini_file = os.path.realpath(config_file)
                 kallithea.CONFIG = paste.deploy.appconfig('config:' + path_to_ini_file)
                 config_string = read_config(path_to_ini_file, strip_section_prefix=annotated.__name__)
                 logging.config.fileConfig(io.StringIO(config_string),
                     {'__file__': path_to_ini_file, 'here': os.path.dirname(path_to_ini_file)})
                 if config_file_initialize_app:
-                    kallithea.config.middleware.make_app_without_logging(kallithea.CONFIG.global_conf, **kallithea.CONFIG.local_conf)
+                    kallithea.config.middleware.make_app(kallithea.CONFIG.global_conf, **kallithea.CONFIG.local_conf)
                 return annotated(*args, **kwargs)
             return cli_command(runtime_wrapper)
         return annotator
     return cli_command

kallithea/bin/kallithea_cli_db.py

➞

Show inline comments

@@ @@ -64,13 +64,13 @@ def db_create(user, password, email, rep @@
     dbmanage.admin_prompt()
     dbmanage.create_permissions()
     dbmanage.populate_default_permissions()
     Session().commit()
     # initial repository scan
-    kallithea.config.middleware.make_app_without_logging(
+    kallithea.config.middleware.make_app(
             kallithea.CONFIG.global_conf, **kallithea.CONFIG.local_conf)
     added, _ = kallithea.lib.utils.repo2db_mapper(kallithea.model.scm.ScmModel().repo_scan())
     if added:
         click.echo('Initial repository scan: added following repositories:')
         click.echo('\t%s' % '\n\t'.join(added))
     else:

kallithea/config/middleware.py

➞

Show inline comments

@@ @@ -21,17 +21,12 @@ __all__ = ['make_app'] @@
 # 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_without_logging(global_conf, full_stack=True, **app_conf):
     """The core of make_app for use from gearbox commands (other than 'serve')"""
     return make_base_app(global_conf, full_stack=full_stack, **app_conf)
 def make_app(global_conf, full_stack=True, **app_conf):
     """
     Set up Kallithea with the settings found in the PasteDeploy configuration
     file used.
     :param global_conf: The global settings for Kallithea (those
@@ @@ -44,7 +39,7 @@ def make_app(global_conf, full_stack=Tru @@
     This is the PasteDeploy factory for the Kallithea application.
     ``app_conf`` contains all the application-specific settings (those defined
     under ``[app:main]``.
     """
-    return make_app_without_logging(global_conf, full_stack=full_stack, **app_conf)
+    return make_base_app(global_conf, full_stack=full_stack, **app_conf)

kallithea/lib/hooks.py

➞

Show inline comments

@@ @@ -307,13 +307,13 @@ def _hook_environment(repo_path): @@
     extras = get_hook_environment()
     path_to_ini_file = extras['config']
     kallithea.CONFIG = paste.deploy.appconfig('config:' + path_to_ini_file)
     #logging.config.fileConfig(ini_file_path) # Note: we are in a different process - don't use configured logging
-    kallithea.config.middleware.make_app_without_logging(kallithea.CONFIG.global_conf, **kallithea.CONFIG.local_conf)
+    kallithea.config.middleware.make_app(kallithea.CONFIG.global_conf, **kallithea.CONFIG.local_conf)
     repo_path = safe_unicode(repo_path)
     # fix if it's not a bare repo
     if repo_path.endswith(os.sep + '.git'):
         repo_path = repo_path[:-5]

0 comments (0 inline, 0 general)