Merge branch 'master' into 17-logging

Author: kayleg

examples/long_lived.rs

@@ -27,16 +27,18 @@ fn schedule_pubsub_pull(subscription: Arc<Subscription>) {
     task::spawn(async move {
         while subscription.client().is_running() {
             match subscription.get_messages::<UpdatePacket>().await {
-                Ok((packets, acks)) => {
-                    for packet in packets {
-                        println!("Received: {:?}", packet);
-                    }
-
-                    if !acks.is_empty() {
-                        let s = Arc::clone(&subscription);
-                        task::spawn(async move {
-                            s.acknowledge_messages(acks).await;
-                        });
+                Ok(messages) => {
+                    for (result, ack_id) in messages {
+                        match result {
+                            Ok(message) => {
+                                println!("Received: {:?}", message);
+                                let subscription = Arc::clone(&subscription);
+                                task::spawn(async move {
+                                    subscription.acknowledge_messages(vec![ack_id]).await;
+                                });
+                            }
+                            Err(e) => log::error!("Failed converting to UpdatePacket: {}", e),
+                        }
                     }
                 }
                 Err(e) => eprintln!("Failed to pull PubSub messages: {}", e),

examples/serde.rs

@@ -41,11 +41,15 @@ async fn main() {
 
     let order_sub = Arc::new(pubsub.subscribe(config.pubsub_subscription));
     match order_sub.clone().get_messages::<UpdatePacket>().await {
-        Ok((packets, acks)) => {
-            for packet in packets {
+        Ok(packets) => {
+            for packet in &packets {
                 println!("Received: {:?}", packet);
             }
 
+            let acks: Vec<String> = packets
+                .into_iter()
+                .map(|packet| packet.1)
+                .collect::<Vec<_>>();
             if !acks.is_empty() {
                 task::spawn(async move { order_sub.acknowledge_messages(acks).await })
                     .await // This will block until acknowledgement is complete

examples/singleshot.rs

@@ -36,19 +36,22 @@ async fn main() {
         Ok(p) => p,
     };
 
-    let order_sub = Arc::new(pubsub.subscribe(config.pubsub_subscription));
-    match order_sub.clone().get_messages::<UpdatePacket>().await {
-        Ok((packets, acks)) => {
-            for packet in packets {
-                println!("Received: {:?}", packet);
-            }
-
-            if !acks.is_empty() {
-                task::spawn(async move { order_sub.acknowledge_messages(acks).await })
-                    .await // This will block until acknowledgement is complete
-                    .expect("Failed to acknoweldge messages");
+    let subscription = Arc::new(pubsub.subscribe(config.pubsub_subscription));
+    match subscription.get_messages::<UpdatePacket>().await {
+        Ok(messages) => {
+            for (result, ack_id) in messages {
+                match result {
+                    Ok(message) => {
+                        println!("Received: {:?}", message);
+                        let subscription = Arc::clone(&subscription);
+                        task::spawn(async move {
+                            subscription.acknowledge_messages(vec![ack_id]).await;
+                        });
+                    }
+                    Err(e) => log::error!("Failed converting to UpdatePacket: {}", e),
+                }
             }
         }
-        Err(e) => println!("Error Checking PubSub: {}", e),
+        Err(e) => eprintln!("Failed to pull PubSub messages: {}", e),
     }
 }

examples/subscribe_to_topic.rs

@@ -33,17 +33,21 @@ async fn main() {
     let sub = topic.subscribe().await.expect("Failed to subscribe");
 
     println!("Subscribed to topic with: {}", sub.name);
-    let (packets, acks) = sub
+    let packets = sub
         .clone()
         .get_messages::<UpdatePacket>()
         .await
         .expect("Error Checking PubSub");
 
-    for packet in packets {
+    for packet in &packets {
         println!("Received: {:?}", packet);
     }
 
-    if !acks.is_empty() {
+    if !packets.is_empty() {
+        let acks = packets
+            .into_iter()
+            .map(|packet| packet.1)
+            .collect::<Vec<_>>();
         sub.acknowledge_messages(acks).await;
     } else {
         println!("Cleaning up");

src/subscription.rs

@@ -59,7 +59,7 @@ impl Subscription {
 
     pub async fn get_messages<T: FromPubSubMessage>(
         &self,
-    ) -> Result<(Vec<T>, Vec<String>), error::Error> {
+    ) -> Result<Vec<(Result<T, error::Error>, String)>, error::Error> {
         let client = self
             .client
             .as_ref()
@@ -75,6 +75,7 @@ impl Subscription {
         *req.uri_mut() = uri.clone();
 
         let response = client.hyper_client().request(req).await?;
+
         if response.status() == StatusCode::NOT_FOUND {
             return Err(error::Error::PubSub {
                 code: 404,
@@ -87,24 +88,13 @@ impl Subscription {
         if let Some(e) = response.error {
             return Err(e);
         }
-        let messages = response.received_messages.unwrap_or_default();
-        let ack_ids: Vec<String> = messages
-            .as_slice()
-            .iter()
-            .map(|packet| packet.ack_id.clone())
-            .collect();
-        let packets = messages
+        let messages = response
+            .received_messages
+            .unwrap_or_default()
             .into_iter()
-            .filter_map(|packet| match T::from(packet.message) {
-                Ok(o) => Some(o),
-                Err(e) => {
-                    log::error!("Failed converting pubsub {}", e);
-                    None
-                }
-            })
+            .map(|m| (T::from(m.message), m.ack_id))
             .collect();
-
-        Ok((packets, ack_ids))
+        Ok(messages)
     }
 
     pub async fn destroy(self) -> Result<(), error::Error> {