Show More
@@ -79,7 +79,7 def register_command(needs_config_file=F | |||||
79 | if needs_config_file: |
|
79 | if needs_config_file: | |
80 | annotated(*args, config=config, **kwargs) |
|
80 | annotated(*args, config=config, **kwargs) | |
81 | if config_file_initialize_app: |
|
81 | if config_file_initialize_app: | |
82 | kallithea.config.application.make_app(config.global_conf, **config.local_conf) |
|
82 | kallithea.config.application.make_app_raw(config.global_conf, **config.local_conf) | |
83 | annotated(*args, **kwargs) |
|
83 | annotated(*args, **kwargs) | |
84 | return cli_command(runtime_wrapper) |
|
84 | return cli_command(runtime_wrapper) | |
85 | return annotator |
|
85 | return annotator |
@@ -40,7 +40,7 def celery_run(celery_args, config): | |||||
40 |
|
40 | |||
41 | kallithea.CELERY_APP.config_from_object(celery_app.make_celery_config(config)) |
|
41 | kallithea.CELERY_APP.config_from_object(celery_app.make_celery_config(config)) | |
42 |
|
42 | |||
43 | kallithea.CELERY_APP.loader.on_worker_process_init = lambda: kallithea.config.application.make_app(config.global_conf, **config.local_conf) |
|
43 | kallithea.CELERY_APP.loader.on_worker_process_init = lambda: kallithea.config.application.make_app_raw(config.global_conf, **config.local_conf) | |
44 |
|
44 | |||
45 | args = list(celery_args) |
|
45 | args = list(celery_args) | |
46 | # args[0] is generally ignored when prog_name is specified, but -h *needs* it to be 'worker' ... but will also suggest that users specify 'worker' explicitly |
|
46 | # args[0] is generally ignored when prog_name is specified, but -h *needs* it to be 'worker' ... but will also suggest that users specify 'worker' explicitly |
@@ -116,7 +116,7 def _git_hook_environment(repo_path): | |||||
116 | path_to_ini_file = extras['config'] |
|
116 | path_to_ini_file = extras['config'] | |
117 | config = paste.deploy.appconfig('config:' + path_to_ini_file) |
|
117 | config = paste.deploy.appconfig('config:' + path_to_ini_file) | |
118 | #logging.config.fileConfig(ini_file_path) # Note: we are in a different process - don't use configured logging |
|
118 | #logging.config.fileConfig(ini_file_path) # Note: we are in a different process - don't use configured logging | |
119 | kallithea.config.application.make_app(config.global_conf, **config.local_conf) |
|
119 | kallithea.config.application.make_app_raw(config.global_conf, **config.local_conf) | |
120 |
|
120 | |||
121 | # fix if it's not a bare repo |
|
121 | # fix if it's not a bare repo | |
122 | if repo_path.endswith(os.sep + '.git'): |
|
122 | if repo_path.endswith(os.sep + '.git'): |
@@ -48,6 +48,12 def wrap_app(app): | |||||
48 |
|
48 | |||
49 |
|
49 | |||
50 | def make_app(global_conf, **app_conf): |
|
50 | def make_app(global_conf, **app_conf): | |
|
51 | """Return WSGI app with logging Mercurial stdout/stderr - to be used as | |||
|
52 | Paste or mod_wsgi entry point""" | |||
|
53 | return make_app_raw(global_conf, **app_conf) | |||
|
54 | ||||
|
55 | ||||
|
56 | def make_app_raw(global_conf, **app_conf): | |||
51 | """ |
|
57 | """ | |
52 | Set up Kallithea with the settings found in the PasteDeploy configuration |
|
58 | Set up Kallithea with the settings found in the PasteDeploy configuration | |
53 | file used. |
|
59 | file used. |
@@ -47,7 +47,7 from kallithea.tests.base import HG_REPO | |||||
47 |
|
47 | |||
48 | rel_path = dirname(dirname(dirname(dirname(os.path.abspath(__file__))))) |
|
48 | rel_path = dirname(dirname(dirname(dirname(os.path.abspath(__file__))))) | |
49 | conf = appconfig('config:development.ini', relative_to=rel_path) |
|
49 | conf = appconfig('config:development.ini', relative_to=rel_path) | |
50 | kallithea.config.application.make_app(conf.global_conf, **conf.local_conf) |
|
50 | kallithea.config.application.make_app_raw(conf.global_conf, **conf.local_conf) | |
51 |
|
51 | |||
52 | USER = TEST_USER_ADMIN_LOGIN |
|
52 | USER = TEST_USER_ADMIN_LOGIN | |
53 | PASS = TEST_USER_ADMIN_PASS |
|
53 | PASS = TEST_USER_ADMIN_PASS |
General Comments 0
You need to be logged in to leave comments.
Login now