preamble 0.0.26 → 0.0.27

raw patch · 5 files changed

+20/−24 lines, 5 files

Files

• preamble.cabal +1/−1
• src/Preamble/Ctx.hs +4/−4
• src/Preamble/Trace.hs +12/−16
• src/Preamble/Types/Alias.hs +2/−2
• src/Preamble/Types/Ctx.hs +1/−1

@@ -1,5 +1,5 @@ name:                  preamble-version:               0.0.26+version:               0.0.27 synopsis:              Yet another prelude. description:           A prelude built on basic-prelude. homepage:              https://github.com/swift-nav/preamble

@@ -20,13 +20,13 @@ -- runTransT :: HasCtx c => c -> TransT c m a -> m a runTransT c m =-  runReaderT (runLoggingT (unTransT m) (c ^. cTrace)) c+  runReaderT (runLoggingT (unTransT m) (c ^. cLogger)) c  -- | Run base context. ---runCtx :: MonadIO m => LogLevel -> TransT Ctx m a -> m a-runCtx level action = do-  t <- liftIO $ newStderrTrace level+runCtx :: MonadIO m => TransT Ctx m a -> m a+runCtx action = do+  t <- liftIO $ newStderrLogger LevelInfo   runTransT (Ctx mempty t) action  -- | Update base context's preamble.

@@ -5,10 +5,9 @@ -- | Tracing functionality around MonadLogger. -- module Preamble.Trace-  ( LogLevel (..)-  , newStderrTrace-  , newStdoutTrace-  , nullTrace+  ( newStderrLogger+  , newStdoutLogger+  , nullLogger   , traceDebug   , traceInfo   , traceWarn@@ -28,31 +27,28 @@ import           Preamble.Types import           System.Log.FastLogger --- | Trace out only if gte configured level.+-- | Log out only if gte configured level. ---levelTrace :: LogLevel -> LoggerSet -> Trace-levelTrace level ls _loc _source level' s =+logger :: LogLevel -> LoggerSet -> Logger+logger level ls _loc _source level' s =   unless (level' < level) $ do     pushLogStr ls s     flushLogStr ls  -- | New logger to stderr. ---newStderrTrace :: MonadIO m => LogLevel -> m Trace-newStderrTrace level =-  liftIO $ levelTrace level <$> newStderrLoggerSet defaultBufSize+newStderrLogger :: MonadIO m => LogLevel -> m Logger+newStderrLogger level = liftIO $ logger level <$> newStderrLoggerSet defaultBufSize  -- | New logger to stdout. ---newStdoutTrace :: MonadIO m => LogLevel -> m Trace-newStdoutTrace level =-  liftIO $ levelTrace level <$> newStdoutLoggerSet defaultBufSize+newStdoutLogger :: MonadIO m => LogLevel -> m Logger+newStdoutLogger level = liftIO $ logger level <$> newStdoutLoggerSet defaultBufSize  -- | Logger to nowhere. ---nullTrace :: Trace-nullTrace _loc _source _level _s =-  return ()+nullLogger :: Logger+nullLogger _loc _source _level _s = return ()  -- | Trace out event with preamble and timestamp. --

@@ -23,9 +23,9 @@ -- type Tags = [(Text, Text)] --- | Trace+-- | Logger ---type Trace = Loc -> LogSource -> LogLevel -> LogStr -> IO ()+type Logger = Loc -> LogSource -> LogLevel -> LogStr -> IO ()  -- | MonadControl --

@@ -25,7 +25,7 @@ data Ctx = Ctx   { _cPreamble :: Pairs     -- ^ Object to encode on every trace line.-  , _cTrace    :: Trace+  , _cLogger   :: Logger     -- ^ Configurable tracing function.   }