From 151f236a0b8de510b1896deeaa9c571f845040af Mon Sep 17 00:00:00 2001 From: _ <> Date: Sat, 7 Nov 2020 23:10:01 +0000 Subject: [PATCH] :lipstick: Tweak a few things and update todo --- src/graceful_shutdown.rs | 2 +- src/server/file_server.rs | 2 +- todo.md | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/graceful_shutdown.rs b/src/graceful_shutdown.rs index 15cb518..c1917e6 100644 --- a/src/graceful_shutdown.rs +++ b/src/graceful_shutdown.rs @@ -73,7 +73,7 @@ impl ForcedShutdown { let fut = async move { self.rx.await.unwrap (); self.tx.send (()).unwrap (); - let timeout = 10; + let timeout = 5; debug! ("Starting graceful shutdown. Forcing shutdown in {} seconds", timeout); delay_for (Duration::from_secs (timeout)).await; diff --git a/src/server/file_server.rs b/src/server/file_server.rs index fd7e922..bc04821 100644 --- a/src/server/file_server.rs +++ b/src/server/file_server.rs @@ -196,7 +196,7 @@ async fn serve_file ( bytes_left -= bytes_read; if bytes_left == 0 { - info! ("Finished"); + debug! ("Finished"); break; } diff --git a/todo.md b/todo.md index 37fed23..ed1393c 100644 --- a/todo.md +++ b/todo.md @@ -1,4 +1,3 @@ -- Relay doesn't always shut down _if_ accessed by Firefox? - Not working behind Nginx - Try sending the http_response "OK" _after_ the request body is received @@ -22,3 +21,10 @@ Off-project stuff: - Benchmark directory entry sorting + +Known issues: + +Relay can't shut down gracefully if Firefox is connected to it, e.g. if Firefox +kept a connection open while watching a video. +I'm pretty sure this is a bug in Hyper, so for now I've worked around it with a +forced shutdown timer.