feat(ssh-wrapper-speedup): major rewrite of code to address imports problem with ssh-wrapper-v2
- use bootstrapped settings rather than config - use more code split to make sure we don't import heavy code
This commit is contained in:
parent
d57482be62
commit
fc0ee0e99b
33 changed files with 764 additions and 562 deletions
|
|
@ -31,7 +31,6 @@ from .utils import setup_custom_logging
|
|||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
|
||||
@click.command()
|
||||
@click.argument('ini_path', type=click.Path(exists=True))
|
||||
@click.option(
|
||||
|
|
@ -55,11 +54,12 @@ def main(ini_path, mode, user, user_id, key_id, shell, debug):
|
|||
connection_info = os.environ.get('SSH_CONNECTION', '')
|
||||
time_start = time.time()
|
||||
with bootstrap(ini_path, env={'RC_CMD_SSH_WRAPPER': '1'}) as env:
|
||||
settings = env['registry'].settings
|
||||
statsd = StatsdClient.statsd
|
||||
try:
|
||||
ssh_wrapper = SshWrapper(
|
||||
command, connection_info, mode,
|
||||
user, user_id, key_id, shell, ini_path, env)
|
||||
user, user_id, key_id, shell, ini_path, settings, env)
|
||||
except Exception:
|
||||
log.exception('Failed to execute SshWrapper')
|
||||
sys.exit(-5)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue