From 0ab134a36486c184ea5de1e8289ec6f025bb32fd Mon Sep 17 00:00:00 2001 From: Balakrishnan Balasubramanian Date: Mon, 11 Sep 2023 21:09:12 -0400 Subject: [PATCH] Remove local override for anyhttp --- go.mod | 4 +--- go.sum | 2 ++ main.go | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 4c3fd5d..8f385f8 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,8 @@ module go.balki.me/collage-maker go 1.21 require ( - go.balki.me/anyhttp v0.2.0 + go.balki.me/anyhttp v0.3.0 go.oneofone.dev/resize v1.0.1 ) require golang.org/x/image v0.1.0 // indirect - -replace go.balki.me/anyhttp => ../anyhttp diff --git a/go.sum b/go.sum index 8646212..0840792 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,6 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.balki.me/anyhttp v0.3.0 h1:WtBQ0rnkg567sX/O4ij/+qBbdCIUt5VURSe718sITBY= +go.balki.me/anyhttp v0.3.0/go.mod h1:JhfekOIjgVODoVqUCficjpIgmB3wwlB7jhN0eN2EZ/s= go.oneofone.dev/resize v1.0.1 h1:HjpVar/4pxMGrjO44ThaMX1Q5UOBw0KxzbxxRDZPQuA= go.oneofone.dev/resize v1.0.1/go.mod h1:zGFmn7q4EUZVlnDmxqf+b0mWpxsTt0MH2yx6ng8tpq0= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/main.go b/main.go index adb68fa..d0c31ab 100644 --- a/main.go +++ b/main.go @@ -96,13 +96,13 @@ func main() { slog.Error("Failed to write collageFile", "error", err) } }) - addrType, server, err := anyhttp.ListenAndServeHTTP(listenAddr, idle.WrapHandler(nil)) + addrType, server, done, err := anyhttp.Serve(listenAddr, idle.WrapHandler(nil)) if err != nil { - slog.Error("anyhttp ListenAndServeHTTP failed", "error", err) + slog.Error("anyhttp Serve failed", "error", err) } if addrType == anyhttp.SystemdFD { - if err := idle.Wait(1 * time.Minute); err != nil { + if err := idle.Wait(30 * time.Minute); err != nil { slog.Error("Failed to wait for idler", "error", err) } ctx, _ := context.WithTimeout(context.Background(), 1*time.Minute) // Don't want any stuck connections @@ -110,7 +110,7 @@ func main() { slog.Error("http server Shutdown failed", "error", err) } } else { - select {} + <-done } }