X-Git-Url: https://piware.de/gitweb/?p=learn-rust.git;a=blobdiff_plain;f=async-http%2Fsrc%2Fmain.rs;h=c36be0ad86d093e4619b1c3e41dfe474d4d5a073;hp=09ca609eaa0d6333fc08cd86cfb08b3ca936dae2;hb=5ae5a42b2644afab404f99b01503d6dd7d6a01b1;hpb=a254aa3419bd260f1e28e8759bb172a6c2b5cf44

diff --git a/async-http/src/main.rs b/async-http/src/main.rs
index 09ca609..c36be0a 100644
--- a/async-http/src/main.rs
+++ b/async-http/src/main.rs
@@ -1,39 +1,46 @@
 use std::fs;
 use std::io::prelude::*;
-use std::net::TcpListener;
-use std::net::TcpStream;
+use std::net::{ TcpListener, TcpStream };
+use std::time::Duration;
+
+use async_std::task;
+
+#[async_std::main]
+async fn main() {
+    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
 
-fn main() {
     // Listen for incoming TCP connections on localhost port 7878
     let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
 
     // Block forever, handling each request that arrives at this IP address
     for stream in listener.incoming() {
         let stream = stream.unwrap();
-
-        handle_connection(stream);
+        // not concurrent
+        handle_connection(stream).await;
     }
 }
 
-fn handle_connection(mut stream: TcpStream) {
+async fn handle_connection(mut stream: TcpStream) {
     // Read the first 1024 bytes of data from the stream
     let mut buffer = [0; 1024];
-    stream.read(&mut buffer).unwrap();
-
-    let get = b"GET / HTTP/1.1\r\n";
+    assert!(stream.read(&mut buffer).unwrap() > 0);
 
     // Respond with greetings or a 404,
     // depending on the data in the request
-    let (status_line, filename) = if buffer.starts_with(get) {
-        ("HTTP/1.1 200 OK\r\n\r\n", "index.html")
+    let (status_line, filename) = if buffer.starts_with(b"GET / HTTP/1.1\r\n") {
+        ("HTTP/1.1 200 OK", "index.html")
+    } else if buffer.starts_with(b"GET /sleep HTTP/1.1\r\n") {
+        task::sleep(Duration::from_secs(5)).await;
+        ("HTTP/1.1 201 Sleep", "index.html")
     } else {
-        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+        ("HTTP/1.1 404 NOT FOUND", "404.html")
     };
     let contents = fs::read_to_string(filename).unwrap();
+    log::info!("GET {} {}", filename, status_line);
 
     // Write response back to the stream,
     // and flush the stream to ensure the response is sent back to the client
-    let response = format!("{status_line}{contents}");
+    let response = format!("{status_line}\r\n\r\n{contents}");
     stream.write_all(response.as_bytes()).unwrap();
     stream.flush().unwrap();
 }