1 files changed, 21 insertions, 15 deletions

diff --git a/examples/logs.rs b/examples/logs.rs
index 57f12be..73c8045 100644
--- a/examples/logs.rs
+++ b/examples/logs.rs
@@ -1,25 +1,31 @@
-use shiplift::{tty::StreamType, Docker, LogsOptions};
+use futures::StreamExt;
+use shiplift::{tty::TtyChunk, Docker, LogsOptions};
 use std::env;
-use tokio::prelude::{Future, Stream};
 
-fn main() {
+#[tokio::main]
+async fn main() {
     let docker = Docker::new();
     let id = env::args()
         .nth(1)
         .expect("You need to specify a container id");
-    let fut = docker
+
+    let mut logs_stream = docker
         .containers()
         .get(&id)
-        .logs(&LogsOptions::builder().stdout(true).stderr(true).build())
-        .for_each(|chunk| {
-            match chunk.stream_type {
-                StreamType::StdOut => println!("Stdout: {}", chunk.as_string_lossy()),
-                StreamType::StdErr => eprintln!("Stderr: {}", chunk.as_string_lossy()),
-                StreamType::StdIn => unreachable!(),
-            }
-            Ok(())
-        })
-        .map_err(|e| eprintln!("Error: {}", e));
+        .logs(&LogsOptions::builder().stdout(true).stderr(true).build());
+
+    while let Some(log_result) = logs_stream.next().await {
+        match log_result {
+            Ok(chunk) => print_chunk(chunk),
+            Err(e) => eprintln!("Error: {}", e),
+        }
+    }
+}
 
-    tokio::run(fut);
+fn print_chunk(chunk: TtyChunk) {
+    match chunk {
+        TtyChunk::StdOut(bytes) => println!("Stdout: {}", std::str::from_utf8(&bytes).unwrap()),
+        TtyChunk::StdErr(bytes) => eprintln!("Stdout: {}", std::str::from_utf8(&bytes).unwrap()),
+        TtyChunk::StdIn(_) => unreachable!(),
+    }
 }