From 15d9e540df0ae5492896d236f8465b22f786b571 Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Wed, 18 Dec 2024 11:44:25 +0100 Subject: [PATCH 1/4] weed. --- services/galley/src/Galley/Intra/Util.hs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/services/galley/src/Galley/Intra/Util.hs b/services/galley/src/Galley/Intra/Util.hs index fa24f814ae5..4b369046b1b 100644 --- a/services/galley/src/Galley/Intra/Util.hs +++ b/services/galley/src/Galley/Intra/Util.hs @@ -38,13 +38,12 @@ import Galley.Options import Imports hiding (log) import Network.HTTP.Types -data IntraComponent = Brig | Spar | Gundeck +data IntraComponent = Brig | Spar deriving (Show) componentName :: IntraComponent -> String componentName Brig = "brig" componentName Spar = "spar" -componentName Gundeck = "gundeck" componentRequest :: IntraComponent -> Opts -> Request -> Request componentRequest Brig o = @@ -53,17 +52,10 @@ componentRequest Brig o = componentRequest Spar o = B.host (encodeUtf8 o._spar.host) . B.port (portNumber $ fromIntegral . port $ o._spar) -componentRequest Gundeck o = - B.host (encodeUtf8 o._gundeck.host) - . B.port (portNumber $ fromIntegral . port $ o._gundeck) - . method POST - . path "/i/push/v2" - . expect2xx componentRetryPolicy :: IntraComponent -> RetryPolicy componentRetryPolicy Brig = x1 componentRetryPolicy Spar = x1 -componentRetryPolicy Gundeck = limitRetries 0 call :: IntraComponent -> From 1abf2a9f7e179c5077fc3fe327fd18954ac815ff Mon Sep 17 00:00:00 2001 From: Sven Tennie Date: Wed, 18 Dec 2024 13:36:56 +0100 Subject: [PATCH 2/4] Remove redundant import --- services/galley/src/Galley/Intra/Util.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/services/galley/src/Galley/Intra/Util.hs b/services/galley/src/Galley/Intra/Util.hs index 4b369046b1b..18070288aca 100644 --- a/services/galley/src/Galley/Intra/Util.hs +++ b/services/galley/src/Galley/Intra/Util.hs @@ -36,7 +36,6 @@ import Galley.Env hiding (brig) import Galley.Monad import Galley.Options import Imports hiding (log) -import Network.HTTP.Types data IntraComponent = Brig | Spar deriving (Show) From a7b325efa598c3f9f3c5d5a87585998e438f9d73 Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Wed, 18 Dec 2024 15:12:56 +0100 Subject: [PATCH 3/4] hi ci From f58fd7767a50f77c06b8ad8f8676f3d7aa96fc49 Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Wed, 18 Dec 2024 15:16:13 +0100 Subject: [PATCH 4/4] hi ci