Commit 70f4bc28 authored by inso's avatar inso

Fix session and endpoints bugs

parent 702c84fa
......@@ -55,10 +55,7 @@ class ConnectionHandler(object):
self.ws_scheme = ws_scheme
self.server = server
self.port = port
if session is None:
self.session = aiohttp.ClientSession()
else:
self.session = session
self.session = session
def __str__(self):
return 'connection info: %s:%d' % (self.server, self.port)
......
......@@ -229,7 +229,7 @@ class SecuredBMAEndpoint(BMAEndpoint):
return cls(server, ipv4, ipv6, port)
def inline(self):
return "BASIC_MERKLED_API{DNS}{IPv4}{IPv6}{PORT}" \
return "BMAS{DNS}{IPv4}{IPv6}{PORT}" \
.format(DNS=(" {0}".format(self.server) if self.server else ""),
IPv4=(" {0}".format(self.ipv4) if self.ipv4 else ""),
IPv6=(" {0}".format(self.ipv6) if self.ipv6 else ""),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment