mirror
/
amqtt
kopia lustrzana https://github.com/Yakifo/amqtt
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Various fixes

pull/8/head
Nico 2015-11-01 14:23:00 +01:00
rodzic 6daa752800
commit 36c086df30
2 zmienionych plików z 7 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
hbmqtt/mqtt/protocol/handler.py
Wyświetl plik

@ -353,8 +353,8 @@ class ProtocolHandler:
running_tasks.popleft() running_tasks.popleft()
if len(running_tasks) > 1: if len(running_tasks) > 1:
self.logger.debug("handler running tasks: %d" % len(running_tasks)) self.logger.debug("handler running tasks: %d" % len(running_tasks))
fixed_header = await asyncio.wait_for(
MQTTFixedHeader.from_stream(self.reader), fixed_header = await asyncio.wait_for(MQTTFixedHeader.from_stream(self.reader),
keepalive_timeout, loop=self._loop) keepalive_timeout, loop=self._loop)
if fixed_header: if fixed_header:
if fixed_header.packet_type == RESERVED_0 or fixed_header.packet_type == RESERVED_15: if fixed_header.packet_type == RESERVED_0 or fixed_header.packet_type == RESERVED_15:
@ -403,6 +403,8 @@ class ProtocolHandler:
else: else:
self.logger.debug("%s No more data (EOF received), stopping reader coro" % self.session.client_id) self.logger.debug("%s No more data (EOF received), stopping reader coro" % self.session.client_id)
break break
except MQTTException:
self.logger.debug("Message discarded")
except asyncio.CancelledError: except asyncio.CancelledError:
self.logger.debug("Task cancelled, reader loop ending") self.logger.debug("Task cancelled, reader loop ending")
break break
@ -412,7 +414,7 @@ class ProtocolHandler:
except NoDataException: except NoDataException:
self.logger.debug("%s No data available" % self.session.client_id) self.logger.debug("%s No data available" % self.session.client_id)
except BaseException as e: except BaseException as e:
self.logger.warning("%s Unhandled exception in reader coro: %s" % (type(self).__name__, e)) self.logger.warning("%s Unhandled exception in reader coro: %r" % (type(self).__name__, e))
break break
while running_tasks: while running_tasks:
running_tasks.popleft().cancel() running_tasks.popleft().cancel()

3
samples/client_subscribe.py
Wyświetl plik

@ -25,7 +25,8 @@ async def uptime_coro():
logger.info("Subscribed") logger.info("Subscribed")
try: try:
for i in range(1, 100): for i in range(1, 100):
packet = await C.deliver_message() message = await C.deliver_message()
packet = message.publish_packet
print("%d %s : %s" % (i, packet.variable_header.topic_name, str(packet.payload.data))) print("%d %s : %s" % (i, packet.variable_header.topic_name, str(packet.payload.data)))
await C.unsubscribe(['$SYS/broker/uptime']) await C.unsubscribe(['$SYS/broker/uptime'])
logger.info("UnSubscribed") logger.info("UnSubscribed")