# HG changeset patch # User Marcin Kuzminski # Date 2017-11-06 10:43:38 # Node ID dc0a58ba9422c19e8ff9844e11f883be7edb797e # Parent 1517e3b2c49488f837903331e6d6275b18ddfc25 ssh: use proper way of extracting the HOOK_PROTOCOL out of vcssettings. - it might be not stored inside the .ini file so we should use the config that has proper defaults, and it's used in many other places. diff --git a/rhodecode/apps/ssh_support/lib/backends/base.py b/rhodecode/apps/ssh_support/lib/backends/base.py --- a/rhodecode/apps/ssh_support/lib/backends/base.py +++ b/rhodecode/apps/ssh_support/lib/backends/base.py @@ -24,7 +24,7 @@ import json import logging from rhodecode.lib.hooks_daemon import prepare_callback_daemon -from rhodecode.lib import hooks_utils +from rhodecode.lib.vcs.conf import settings as vcs_settings from rhodecode.model.scm import ScmModel log = logging.getLogger(__name__) @@ -135,10 +135,9 @@ class VcsServer(object): def run(self): extras = {} - HOOKS_PROTOCOL = self.config.get('app:main', 'vcs.hooks.protocol') callback_daemon, extras = prepare_callback_daemon( - extras, protocol=HOOKS_PROTOCOL, + extras, protocol=vcs_settings.HOOKS_PROTOCOL, use_direct_calls=False) with callback_daemon: