diff options
| author | Ariel Nunez <54999+ingenieroariel@users.noreply.github.com> | 2020-08-13 15:43:19 -0500 |
|---|---|---|
| committer | Ariel Nunez <54999+ingenieroariel@users.noreply.github.com> | 2020-09-03 14:59:08 -0500 |
| commit | a29ed35bc7af11418e7319150f57a7beab0a8f9a (patch) | |
| tree | 63705d47575d8bc3b92de8b197041507ff12e8f3 /pkgs/development/haskell-modules/patches | |
| parent | ad7f8917fd5f330769884efa82ffc304348441eb (diff) | |
| download | nixpkgs-a29ed35bc7af11418e7319150f57a7beab0a8f9a.tar nixpkgs-a29ed35bc7af11418e7319150f57a7beab0a8f9a.tar.gz nixpkgs-a29ed35bc7af11418e7319150f57a7beab0a8f9a.tar.bz2 nixpkgs-a29ed35bc7af11418e7319150f57a7beab0a8f9a.tar.lz nixpkgs-a29ed35bc7af11418e7319150f57a7beab0a8f9a.tar.xz nixpkgs-a29ed35bc7af11418e7319150f57a7beab0a8f9a.tar.zst nixpkgs-a29ed35bc7af11418e7319150f57a7beab0a8f9a.zip | |
hasura: 1.2.1 -> 1.3.1-beta.1
Diffstat (limited to 'pkgs/development/haskell-modules/patches')
| -rw-r--r-- | pkgs/development/haskell-modules/patches/hasura-884-compat.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/patches/hasura-884-compat.patch b/pkgs/development/haskell-modules/patches/hasura-884-compat.patch new file mode 100644 index 00000000000..bc000ba9cca --- /dev/null +++ b/pkgs/development/haskell-modules/patches/hasura-884-compat.patch @@ -0,0 +1,26 @@ +diff --git server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs +index 6cb70cf0..0c3789cd 100644 +--- server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs ++++ server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs +@@ -45,7 +45,7 @@ import GHC.AssertNF + import qualified ListT + import qualified Network.WebSockets as WS + import qualified StmContainers.Map as STMMap +-import qualified System.IO.Error as E ++--import qualified System.IO.Error as E + + import qualified Hasura.Logging as L + +@@ -287,12 +287,6 @@ createServerApp (WSServer logger@(L.Logger writeLog) serverStatus) wsHandlers !p + let rcv = forever $ do + -- Process all messages serially (important!), in a separate thread: + msg <- liftIO $ +- -- Re-throw "receiveloop: resource vanished (Connection reset by peer)" : +- -- https://github.com/yesodweb/wai/blob/master/warp/Network/Wai/Handler/Warp/Recv.hs#L112 +- -- as WS exception signaling cleanup below. It's not clear why exactly this gets +- -- raised occasionally; I suspect an equivalent handler is missing from WS itself. +- -- Regardless this should be safe: +- handleJust (guard . E.isResourceVanishedError) (\()-> throw WS.ConnectionClosed) $ + WS.receiveData conn + writeLog $ WSLog wsId (EMessageReceived $ TBS.fromLBS msg) Nothing + _hOnMessage wsHandlers wsConn msg |