##// END OF EJS Templates
ssh: use proper way of extracting the HOOK_PROTOCOL out of vcssettings....
marcink -
r2212:dc0a58ba default
parent child Browse files
Show More
@@ -24,7 +24,7 b' import json'
24 import logging
24 import logging
25
25
26 from rhodecode.lib.hooks_daemon import prepare_callback_daemon
26 from rhodecode.lib.hooks_daemon import prepare_callback_daemon
27 from rhodecode.lib import hooks_utils
27 from rhodecode.lib.vcs.conf import settings as vcs_settings
28 from rhodecode.model.scm import ScmModel
28 from rhodecode.model.scm import ScmModel
29
29
30 log = logging.getLogger(__name__)
30 log = logging.getLogger(__name__)
@@ -135,10 +135,9 b' class VcsServer(object):'
135
135
136 def run(self):
136 def run(self):
137 extras = {}
137 extras = {}
138 HOOKS_PROTOCOL = self.config.get('app:main', 'vcs.hooks.protocol')
139
138
140 callback_daemon, extras = prepare_callback_daemon(
139 callback_daemon, extras = prepare_callback_daemon(
141 extras, protocol=HOOKS_PROTOCOL,
140 extras, protocol=vcs_settings.HOOKS_PROTOCOL,
142 use_direct_calls=False)
141 use_direct_calls=False)
143
142
144 with callback_daemon:
143 with callback_daemon:
General Comments 0
You need to be logged in to leave comments. Login now