fix various functions to not create their own logger (hasura#3439)

ecthiender · shahidhk · commit c9b9ed505519 · 2019-11-28T14:33:14.000+05:30
diff --git a/server/src-lib/Hasura/App.hs b/server/src-lib/Hasura/App.hs
@@ -165,7 +165,7 @@ initialiseCtx hgeCmd rci = do
   eDbId <- liftIO $ runExceptT $ Q.runTx pool (Q.Serializable, Nothing) getDbId
   dbId <- either printErrJExit return eDbId
 
-  return $ (InitCtx httpManager instanceId dbId loggers connInfo pool, initTime)
+  return (InitCtx httpManager instanceId dbId loggers connInfo pool, initTime)
   where
     procConnInfo =
       either (printErrExit . connInfoErrModifier) return $ mkConnInfo rci
@@ -205,12 +205,12 @@ runHGEServer ServeOptions{..} InitCtx{..} initTime = do
       Loggers loggerCtx logger _ = _icLoggers
 
   authModeRes <- runExceptT $ mkAuthMode soAdminSecret soAuthHook soJwtSecret soUnAuthRole
-                             _icHttpManager loggerCtx
+                              _icHttpManager logger
 
   authMode <- either (printErrExit . T.unpack) return authModeRes
 
   HasuraApp app cacheRef cacheInitTime shutdownApp <- mkWaiApp soTxIso
-                                                               loggerCtx
+                                                               logger
                                                                sqlGenCtx
                                                                soEnableAllowlist
                                                                _icPgPool
@@ -249,7 +249,7 @@ runHGEServer ServeOptions{..} InitCtx{..} initTime = do
   eventEngineCtx <- liftIO $ atomically $ initEventEngineCtx maxEvThrds evFetchMilliSec
   let scRef = _scrCache cacheRef
   unLogger logger $ mkGenericStrLog LevelInfo "event_triggers" "starting workers"
-  void $ liftIO $ C.forkIO $ processEventQueue loggerCtx logEnvHeaders
+  void $ liftIO $ C.forkIO $ processEventQueue logger logEnvHeaders
     _icHttpManager _icPgPool scRef eventEngineCtx
 
   -- start a background thread to check for updates
diff --git a/server/src-lib/Hasura/Events/Lib.hs b/server/src-lib/Hasura/Events/Lib.hs
@@ -171,16 +171,15 @@ initEventEngineCtx maxT fetchI = do
   return $ EventEngineCtx q c maxT fetchI
 
 processEventQueue
-  :: L.LoggerCtx L.Hasura -> LogEnvHeaders -> HTTP.Manager-> Q.PGPool
+  :: L.Logger L.Hasura -> LogEnvHeaders -> HTTP.Manager-> Q.PGPool
   -> IORef (SchemaCache, SchemaCacheVer) -> EventEngineCtx
   -> IO ()
-processEventQueue logctx logenv httpMgr pool cacheRef eectx = do
+processEventQueue logger logenv httpMgr pool cacheRef eectx = do
   threads <- mapM async [fetchThread, consumeThread]
   void $ waitAny threads
   where
-    fetchThread = pushEvents (L.mkLogger logctx) pool eectx
-    consumeThread = consumeEvents (L.mkLogger logctx)
-                    logenv httpMgr pool (CacheRef cacheRef) eectx
+    fetchThread = pushEvents logger pool eectx
+    consumeThread = consumeEvents logger logenv httpMgr pool (CacheRef cacheRef) eectx
 
 pushEvents
   :: L.Logger L.Hasura -> Q.PGPool -> EventEngineCtx -> IO ()
diff --git a/server/src-lib/Hasura/Server/App.hs b/server/src-lib/Hasura/Server/App.hs
@@ -431,7 +431,7 @@ mkWaiApp
      , MetadataApiAuthorization m
      )
   => Q.TxIsolation
-  -> L.LoggerCtx L.Hasura
+  -> L.Logger L.Hasura
   -> SQLGenCtx
   -> Bool
   -> Q.PGPool
@@ -447,7 +447,7 @@ mkWaiApp
   -> EL.LiveQueriesOptions
   -> E.PlanCacheOptions
   -> m HasuraApp
-mkWaiApp isoLevel loggerCtx sqlGenCtx enableAL pool ci httpManager mode corsCfg enableConsole consoleAssetsDir
+mkWaiApp isoLevel logger sqlGenCtx enableAL pool ci httpManager mode corsCfg enableConsole consoleAssetsDir
          enableTelemetry instanceId apis lqOpts planCacheOptions = do
 
     let pgExecCtx = PGExecCtx pool isoLevel
@@ -466,7 +466,6 @@ mkWaiApp isoLevel loggerCtx sqlGenCtx enableAL pool ci httpManager mode corsCfg
     planCache <- liftIO $ E.initPlanCache planCacheOptions
 
     let corsPolicy = mkDefaultCorsPolicy corsCfg
-        logger = L.mkLogger loggerCtx
 
     lqState <- liftIO $ EL.initLiveQueriesState lqOpts pgExecCtx
     wsServerEnv <- liftIO $ WS.createWSServerEnv logger pgExecCtx lqState cacheRef httpManager corsPolicy
diff --git a/server/src-lib/Hasura/Server/Auth.hs b/server/src-lib/Hasura/Server/Auth.hs
@@ -87,16 +87,16 @@ mkAuthMode
   -> Maybe JWTConfig
   -> Maybe RoleName
   -> H.Manager
-  -> LoggerCtx Hasura
+  -> Logger Hasura
   -> m AuthMode
-mkAuthMode mAdminSecret mWebHook mJwtSecret mUnAuthRole httpManager lCtx =
+mkAuthMode mAdminSecret mWebHook mJwtSecret mUnAuthRole httpManager logger =
   case (mAdminSecret, mWebHook, mJwtSecret) of
     (Nothing,  Nothing,   Nothing)      -> return AMNoAuth
     (Just key, Nothing,   Nothing)      -> return $ AMAdminSecret key mUnAuthRole
     (Just key, Just hook, Nothing)      -> unAuthRoleNotReqForWebHook >>
                                            return (AMAdminSecretAndHook key hook)
     (Just key, Nothing,   Just jwtConf) -> do
-      jwtCtx <- mkJwtCtx jwtConf httpManager lCtx
+      jwtCtx <- mkJwtCtx jwtConf httpManager logger
       return $ AMAdminSecretAndJWT key jwtCtx mUnAuthRole
 
     (Nothing, Just _, Nothing)     -> throwError $
@@ -122,14 +122,13 @@ mkJwtCtx
      )
   => JWTConfig
   -> H.Manager
-  -> LoggerCtx Hasura
+  -> Logger Hasura
   -> m JWTCtx
-mkJwtCtx conf httpManager loggerCtx = do
+mkJwtCtx conf httpManager logger = do
   jwkRef <- case jcKeyOrUrl conf of
     Left jwk  -> liftIO $ newIORef (JWKSet [jwk])
     Right url -> do
       ref <- liftIO $ newIORef $ JWKSet []
-      let logger = mkLogger loggerCtx
       mTime <- updateJwkRef logger httpManager url ref
       case mTime of
         Nothing -> return ref
