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

Fix tuple usage

pull/8/head
Nicolas Jouanin 2015-09-12 14:15:44 +02:00
rodzic 586b898c63
commit b4ffdf482a
1 zmienionych plików z 9 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
hbmqtt/broker.py
Wyświetl plik

@ -676,7 +676,7 @@ class Broker:
import re import re
wildcard_pattern = re.compile('.*?/?\+/?.*?') wildcard_pattern = re.compile('.*?/?\+/?.*?')
try: try:
a_filter = subscription['filter'] a_filter = subscription[0]
if '#' in a_filter and not a_filter.endswith('#'): if '#' in a_filter and not a_filter.endswith('#'):
# [MQTT-4.7.1-2] Wildcard character '#' is only allowed as last character in filter # [MQTT-4.7.1-2] Wildcard character '#' is only allowed as last character in filter
return 0x80 return 0x80
@ -684,7 +684,7 @@ class Broker:
# [MQTT-4.7.1-3] + wildcard character must occupy entire level # [MQTT-4.7.1-3] + wildcard character must occupy entire level
return 0x80 return 0x80
qos = subscription['qos'] qos = subscription[1]
if 'max-qos' in self.config and qos > self.config['max-qos']: if 'max-qos' in self.config and qos > self.config['max-qos']:
qos = self.config['max-qos'] qos = self.config['max-qos']
if a_filter not in self._subscriptions: if a_filter not in self._subscriptions:
@ -776,20 +776,20 @@ class Broker:
@asyncio.coroutine @asyncio.coroutine
def publish_retained_messages_for_subscription(self, subscription, session): def publish_retained_messages_for_subscription(self, subscription, session):
self.logger.debug("Begin broadcasting messages retained due to subscription on '%s' from %s" % self.logger.debug("Begin broadcasting messages retained due to subscription on '%s' from %s" %
(subscription['filter'], format_client_message(session=session))) (subscription[0], format_client_message(session=session)))
publish_tasks = [] publish_tasks = []
for d_topic in self._global_retained_messages: for d_topic in self._global_retained_messages:
self.logger.debug("matching : %s %s" % (d_topic, subscription['filter'])) self.logger.debug("matching : %s %s" % (d_topic, subscription[0]))
if self.matches(d_topic, subscription['filter']): if self.matches(d_topic, subscription[0]):
self.logger.debug("%s and %s match" % (d_topic, subscription['filter'])) self.logger.debug("%s and %s match" % (d_topic, subscription[0]))
retained = self._global_retained_messages[d_topic] retained = self._global_retained_messages[d_topic]
publish_tasks.append(asyncio.Task( publish_tasks.append(asyncio.Task(
session.handler.mqtt_publish( session.handler.mqtt_publish(
retained.topic, retained.data, subscription['qos'], True), loop=self._loop)) retained.topic, retained.data, subscription[1], True), loop=self._loop))
if publish_tasks: if publish_tasks:
yield from asyncio.wait(publish_tasks, loop=self._loop) yield from asyncio.wait(publish_tasks, loop=self._loop)
self.logger.debug("End broadcasting messages retained due to subscription on '%s' from %s" % self.logger.debug("End broadcasting messages retained due to subscription on '%s' from %s" %
(subscription['filter'], format_client_message(session=session))) (subscription[0], format_client_message(session=session)))
def delete_session(self, client_id): def delete_session(self, client_id):
""" """
@ -798,7 +798,7 @@ class Broker:
:return: :return:
""" """
try: try:
session = self._sessions[client_id] session = self._sessions[client_id][0]
except KeyError: except KeyError:
session = None session = None
if session is None: if session is None: