From 1c7a454fb30912971de4cd1ef542b2379cc91799 Mon Sep 17 00:00:00 2001 From: Yuriy Gorishniy Date: Thu, 25 May 2017 16:38:36 +0300 Subject: [PATCH] set docker-client in spawner.start --- everware/spawner.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/everware/spawner.py b/everware/spawner.py index eaa974d..81b37e9 100755 --- a/everware/spawner.py +++ b/everware/spawner.py @@ -86,11 +86,15 @@ def client(self, value): self._client = value @gen.coroutine - def _make_byor_client(self): - """Prepare a client for the user. For a non-BYOR user just use the global client.""" - byor_docker_url = self.user_options['byor_docker_url'] - self.container_ip = byor_docker_url.split(':')[0] - self.client = docker.Client(base_url=byor_docker_url, tls=None, version='auto') + def self._set_client(self): + """Prepare a client for the user. For a non-BYOR user just set the global client.""" + if self._byor_is_used: + byor_docker_url = self.user_options['byor_docker_url'] + self.container_ip = byor_docker_url.split(':')[0] + self.client = docker.Client(base_url=byor_docker_url, tls=None, version='auto') + else: + self.container_ip = self.__class__.container_ip + self.client = self._global_client # We override the executor here to increase the number of threads @property @@ -405,10 +409,8 @@ def start(self, image=None): self._is_failed = False self._is_building = True self._is_empty = False - - self.byor_is_used = (self.user_options['byor_docker_url'] != '') - if self.byor_is_used: - yield self._make_byor_client() + self._byor_is_used = (self.user_options['byor_docker_url'] != '') + self._set_client() try: f = self.build_image()