From 1ac089feaed792cbe08c234e2284a8160dec6809 Mon Sep 17 00:00:00 2001 From: Akhilesh Singh Bhadauriya Date: Wed, 14 Aug 2024 12:48:16 +0530 Subject: [PATCH] Backend/feat/adding-common-prefix-in-redis --- app/gateway/src/App/Types.hs | 11 ++++++----- flake.lock | 12 ++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/gateway/src/App/Types.hs b/app/gateway/src/App/Types.hs index 94386d9..f09540d 100644 --- a/app/gateway/src/App/Types.hs +++ b/app/gateway/src/App/Types.hs @@ -56,7 +56,8 @@ data AppCfg = AppCfg disableSignatureAuth :: Bool, enablePrometheusMetricLogging :: Bool, enableRedisLatencyLogging :: Bool, - internalEndPointMap :: M.Map BaseUrl BaseUrl + internalEndPointMap :: M.Map BaseUrl BaseUrl, + commonRedisPrefix :: Text } deriving (Generic, FromDhall) @@ -109,16 +110,16 @@ buildAppEnv AppCfg {..} = do shouldLogRequestId <- fromMaybe False . (>>= readMaybe) <$> lookupEnv "SHOULD_LOG_REQUEST_ID" let kafkaProducerForART = Nothing let modifierFunc = ("gateway:" <>) - hedisEnv <- Redis.connectHedis hedisCfg modifierFunc - hedisNonCriticalEnv <- Redis.connectHedis hedisNonCriticalCfg modifierFunc + hedisEnv <- Redis.connectHedis hedisCfg modifierFunc commonRedisPrefix + hedisNonCriticalEnv <- Redis.connectHedis hedisNonCriticalCfg modifierFunc commonRedisPrefix hedisNonCriticalClusterEnv <- if cutOffHedisCluster then pure hedisNonCriticalEnv - else Redis.connectHedisCluster hedisNonCriticalClusterCfg modifierFunc + else Redis.connectHedisCluster hedisNonCriticalClusterCfg modifierFunc commonRedisPrefix hedisClusterEnv <- if cutOffHedisCluster then pure hedisEnv - else Redis.connectHedisCluster hedisClusterCfg modifierFunc + else Redis.connectHedisCluster hedisClusterCfg modifierFunc commonRedisPrefix let internalEndPointHashMap = HM.fromList $ M.toList internalEndPointMap return $ AppEnv diff --git a/flake.lock b/flake.lock index 071b4bc..c7283c8 100644 --- a/flake.lock +++ b/flake.lock @@ -536,11 +536,11 @@ "tinylog": "tinylog" }, "locked": { - "lastModified": 1720434283, - "narHash": "sha256-n2fvDHeB1YPkKBCdwZbq2hWt36RK5D0H2qdbIs+ZKFw=", + "lastModified": 1723219060, + "narHash": "sha256-GHoQ9nMpmPxCTqlJBFmIuQxcf90ecM3yk3MAkvfdz68=", "owner": "nammayatri", "repo": "euler-hs", - "rev": "e350f89a80bf9bd6c977aa8086b65091f560d433", + "rev": "a2d3de7e7a1bbac8237909367d8870a285e09c06", "type": "github" }, "original": { @@ -2650,11 +2650,11 @@ "prometheus-haskell": "prometheus-haskell_2" }, "locked": { - "lastModified": 1720622607, - "narHash": "sha256-OuCV1d4gaudZ5ZXkwxSNctr+X+bQyY5vOQoxCltXgeE=", + "lastModified": 1723617077, + "narHash": "sha256-Z7pqihj5Puk9N+Lo3Pl7A3wEwScRDpG0htQ1bC4ZVGI=", "owner": "nammayatri", "repo": "shared-kernel", - "rev": "4a0c36882a475274a7e959b90e28339352192fd1", + "rev": "da1e0e7217115367e9d612fec64b66edeaa76e2b", "type": "github" }, "original": {