Wait to be sure about the scheme before construct the bus URL
issue7792 review54401002
This commit is contained in:
1 parent
62ba7b5a02
commit
4287ca91bf
3 files changed
+10
-2
No files matched your search
@@ -1,3 +1,4 @@
|
||||
* Ensure URL scheme of bus (issue7792)
|
||||
* Add drag & drop support on binary widget
|
||||
|
||||
Version 5.0.0 - 2018-10-01
|
||||
|
||||
+6
-1
@@ -34,7 +34,6 @@ def listen(connection):
|
||||
def _listen(connection):
|
||||
bus_timeout = CONFIG['client.bus_timeout']
|
||||
session = connection.session
|
||||
url = connection.url + '/bus'
|
||||
authorization = base64.b64encode(session.encode('utf-8'))
|
||||
headers = {
|
||||
'Content-Type': 'application/json',
|
||||
@@ -43,7 +42,13 @@ def _listen(connection):
|
||||
|
||||
wait = 1
|
||||
last_message = None
|
||||
url = None
|
||||
while connection.session == session:
|
||||
if url is None:
|
||||
if connection.url is None:
|
||||
time.sleep(1)
|
||||
continue
|
||||
url = connection.url + '/bus'
|
||||
request = Request(url,
|
||||
data=json.dumps({
|
||||
'last_message': last_message,
|
||||
|
||||
+3
-1
@@ -340,10 +340,12 @@ class ServerPool(object):
|
||||
def ssl(self):
|
||||
for conn in self._pool + list(self._used.values()):
|
||||
return conn.ssl
|
||||
return False
|
||||
return None
|
||||
|
||||
@property
|
||||
def url(self):
|
||||
if self.ssl is None:
|
||||
return None
|
||||
scheme = 'https' if self.ssl else 'http'
|
||||
return urljoin(
|
||||
scheme + '://' + self._host + ':' + str(self._port),
|
||||
|
||||
Reference in new issue
Block a user