Skip to content

Using a copy of the broker name when splitting #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 21, 2020
Merged

Using a copy of the broker name when splitting #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7cbb44
Using a copy of the borker name when splitting
Apr 17, 2020
be1ea86
black formatting
Apr 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions adafruit_minimqtt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,11 @@ def connect(self, clean_session=True):

"""
try:
proto, dummy, self.broker, path = self.broker.split("/", 3)
proto, dummy, broker, path = self.broker.split("/", 3)
# replace spaces in path
path = path.replace(" ", "%20")
except ValueError:
proto, dummy, self.broker = self.broker.split("/", 2)
proto, dummy, broker = self.broker.split("/", 2)
path = ""
if proto == "http:":
self.port = MQTT_TCP_PORT
Expand All @@ -236,13 +236,11 @@ def connect(self, clean_session=True):
else:
raise ValueError("Unsupported protocol: " + proto)

if ":" in self.broker:
self.broker, port = self.broker.split(":", 1)
if ":" in broker:
broker, port = broker.split(":", 1)
port = int(port)

addr = _the_sock.getaddrinfo(self.broker, self.port, 0, _the_sock.SOCK_STREAM)[
0
]
addr = _the_sock.getaddrinfo(broker, self.port, 0, _the_sock.SOCK_STREAM)[0]
self._sock = _the_sock.socket(addr[0], addr[1], addr[2])
self._sock.settimeout(15)
if self.port == 8883:
Expand All @@ -251,7 +249,7 @@ def connect(self, clean_session=True):
self.logger.debug(
"Attempting to establish secure MQTT connection..."
)
self._sock.connect((self.broker, self.port), _the_interface.TLS_MODE)
self._sock.connect((broker, self.port), _the_interface.TLS_MODE)
except RuntimeError as e:
raise MMQTTException("Invalid broker address defined.", e)
else:
Expand Down