don't need to check QoS after subscribe anymore

Author: graebm

awsiot/__init__.py

@@ -125,19 +125,20 @@ def _subscribe_operation(self, topic, qos, callback, payload_to_class_fn):
                 message as JSON.
 
         Returns two values. The first is a `Future` which will contain a result
-        of `None` when the server has acknowledged the subscription, or an
-        exception if the subscription fails. The second value is a topic which
-        may be passed to `unsubscribe()` to stop receiving messages.
+        of `awscrt.mqtt.QoS` when the server has acknowledged the subscription,
+        or an exception if the subscription fails. The second value is a topic
+        which may be passed to `unsubscribe()` to stop receiving messages.
         Note that messages may arrive before the subscription is acknowledged.
         """
 
         future = Future() # type: Future
         try:
             def on_suback(suback_future):
-                if suback_future.exception():
-                    future.set_exception(suback_future.exception())
-                else:
-                    future.set_result(None)
+                try:
+                    suback_result = suback_future.result()
+                    future.set_result(suback_result['qos'])
+                except Exception as e:
+                    future.set_exception(e)
 
             def callback_wrapper(topic, payload_bytes):
                 try:

samples/basic_discovery.py

@@ -121,8 +121,8 @@ def on_publish(topic, message):
         print('Publish received on topic {}'.format(topic))
         print(message)
 
-    subscribe_future = mqtt_connection.subscribe(args.topic, QoS.AT_MOST_ONCE, on_publish)
-    subscribe_future[0].result()
+    subscribe_future, _ = mqtt_connection.subscribe(args.topic, QoS.AT_MOST_ONCE, on_publish)
+    subscribe_result = subscribe_future.result()
 
 loop_count = 0
 while loop_count < args.max_pub_ops:

samples/pubsub.py

@@ -108,7 +108,7 @@ def on_message_received(topic, message):
         port = port,
         use_websocket=False,
         clean_session=True,
-        keep_alive=5) # DO NOT COMMIT THIS CHANGE
+        keep_alive=6000)
 
     # Future.result() waits until a result is available
     connect_future.result()
@@ -122,9 +122,7 @@ def on_message_received(topic, message):
         callback=on_message_received)
 
     subscribe_result = subscribe_future.result()
-    if subscribe_result['qos'] is None:
-        raise RuntimeError("Server rejected subscription")
-    print("Subscribed!")
+    print("Subscribed with {}".format(str(subscribe_result['qos'])))
 
     # Publish message to server desired number of times.
     # This step is skipped if message is blank.