From 03131c14007315c0610edd8271b4964f15e7bc9f Mon Sep 17 00:00:00 2001 From: Benjamin Summers Date: Thu, 19 Dec 2019 11:30:09 -0800 Subject: [PATCH] Fix HTTP server effect parse errors. --- pkg/hs/king/app/Main.hs | 2 +- pkg/hs/king/lib/Arvo/Event.hs | 6 +++--- pkg/hs/king/lib/Vere/Http/Server.hs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/hs/king/app/Main.hs b/pkg/hs/king/app/Main.hs index 243dec1ee..0322b6f23 100644 --- a/pkg/hs/king/app/Main.hs +++ b/pkg/hs/king/app/Main.hs @@ -171,7 +171,7 @@ runOrExitImmediately getPier oExit = shutdownImmediately (serf, log, ss) = do logTrace "Sending shutdown signal" logTrace $ displayShow ss - io $ threadDelay 500000 + io $ threadDelay 500000 -- Why is this here? Do I need to force a snapshot to happen? ss <- shutdown serf 0 logTrace $ displayShow ss logTrace "Shutdown!" diff --git a/pkg/hs/king/lib/Arvo/Event.hs b/pkg/hs/king/lib/Arvo/Event.hs index 7fa73e34f..e8b25e2af 100644 --- a/pkg/hs/king/lib/Arvo/Event.hs +++ b/pkg/hs/king/lib/Arvo/Event.hs @@ -172,9 +172,9 @@ data HttpClientEv deriving (Eq, Ord, Show) data HttpServerEv - = HttpServerEvRequest (ServId, Atom, UD, ()) HttpServerReq - | HttpServerEvCancelRequest (ServId, Atom, UD, ()) () - | HttpServerEvRequestLocal (ServId, Atom, UD, ()) HttpServerReq + = HttpServerEvRequest (ServId, UD, UD, ()) HttpServerReq + | HttpServerEvCancelRequest (ServId, UD, UD, ()) () + | HttpServerEvRequestLocal (ServId, UD, UD, ()) HttpServerReq | HttpServerEvLive (ServId, ()) Port (Maybe Port) | HttpServerEvBorn (KingId, ()) () | HttpServerEvCrud Path Cord Tang diff --git a/pkg/hs/king/lib/Vere/Http/Server.hs b/pkg/hs/king/lib/Vere/Http/Server.hs index f15e4b802..3995b1755 100644 --- a/pkg/hs/king/lib/Vere/Http/Server.hs +++ b/pkg/hs/king/lib/Vere/Http/Server.hs @@ -48,7 +48,7 @@ import qualified Network.Wai.Handler.WarpTLS as W -- Internal Types -------------------------------------------------------------- -type ReqId = Atom +type ReqId = UD type SeqId = UD -- Unused, always 1 {-