@@ -7,6 +7,7 @@
7{-# LANGUAGE FlexibleInstances #-}
7{-# LANGUAGE FlexibleInstances #-}
8{-# LANGUAGE GADTs #-}
8{-# LANGUAGE GADTs #-}
9{-# LANGUAGE GeneralizedNewtypeDeriving #-}
9{-# LANGUAGE GeneralizedNewtypeDeriving #-}
10+{-# LANGUAGE ImplicitParams #-}
10{-# LANGUAGE MultiParamTypeClasses #-}
11{-# LANGUAGE MultiParamTypeClasses #-}
11{-# LANGUAGE OverloadedStrings #-}
12{-# LANGUAGE OverloadedStrings #-}
12{-# LANGUAGE RankNTypes #-}
13{-# LANGUAGE RankNTypes #-}
@@ -22,53 +23,40 @@
22module Katip.Core where
23module Katip.Core where
24-------------------------------------------------------------------------------
25-------------------------------------------------------------------------------
25−import Control.Applicative as A
26+import Control.Applicative as A
26import Control.AutoUpdate
27import Control.AutoUpdate
27import Control.Concurrent
28import Control.Concurrent
28−import qualified Control.Concurrent.Async as Async
29+import qualified Control.Concurrent.Async as Async
29import Control.Concurrent.STM
30import Control.Concurrent.STM
30−import qualified Control.Concurrent.STM.TBQueue as BQ
31+import qualified Control.Concurrent.STM.TBQueue as BQ
31import Control.Exception.Safe
32import Control.Exception.Safe
32−import Control.Monad (unless, void, when)
33+import Control.Monad (unless, void)
33import Control.Monad.Base
34import Control.Monad.Base
34−#if MIN_VERSION_base(4, 9, 0)
35−import qualified Control.Monad.Fail as MF
37import Control.Monad.IO.Class
35import Control.Monad.IO.Class
38−import Control.Monad.IO.Unlift
39import Control.Monad.Trans.Class
36import Control.Monad.Trans.Class
40import Control.Monad.Trans.Control
37import Control.Monad.Trans.Control
41−#if !MIN_VERSION_either(4, 5, 0)
42import Control.Monad.Trans.Either
38import Control.Monad.Trans.Either
44import Control.Monad.Trans.Except
39import Control.Monad.Trans.Except
45import Control.Monad.Trans.Maybe
40import Control.Monad.Trans.Maybe
46import Control.Monad.Trans.Reader
41import Control.Monad.Trans.Reader
47−import Control.Monad.Trans.Resource (MonadResource, ResourceT,
42+import Control.Monad.Trans.Resource (ResourceT)
49−import Control.Monad.Trans.RWS.Lazy (RWST, mapRWST)
50−import qualified Control.Monad.Trans.RWS.Strict as Strict (RWST, mapRWST)
51−import Control.Monad.Trans.State.Lazy (StateT, mapStateT)
43+import Control.Monad.Trans.State
52−import qualified Control.Monad.Trans.State.Strict as Strict (StateT, mapStateT)
53−import Control.Monad.Trans.Writer.Lazy (WriterT, mapWriterT)
44+import Control.Monad.Trans.Writer
54−import qualified Control.Monad.Trans.Writer.Strict as Strict (WriterT,
56−import Data.Aeson (FromJSON (..), ToJSON (..),
45+import Data.Aeson (FromJSON (..),
57− object)
46+ ToJSON (..), object)
58−import qualified Data.Aeson as A
47+import qualified Data.Aeson as A
59−import Data.Foldable as FT
48+import Data.Foldable as FT
60−import qualified Data.HashMap.Strict as HM
49+import qualified Data.HashMap.Strict as HM
61import Data.List
50import Data.List
62−import qualified Data.Map.Strict as M
51+import qualified Data.Map.Strict as M
63−import Data.Maybe (fromMaybe)
52+import Data.Semigroup
64−import Data.Semigroup as SG
65import Data.String
53import Data.String
66import Data.String.Conv
54import Data.String.Conv
67−import Data.Text (Text)
55+import Data.Text (Text)
68−import qualified Data.Text as T
56+import qualified Data.Text as T
69−import qualified Data.Text.Lazy.Builder as B
57+import qualified Data.Text.Lazy.Builder as B
70import Data.Time
58import Data.Time
71−import GHC.Generics hiding (to)
59+import GHC.Generics hiding (to)
72#if MIN_VERSION_base(4, 8, 0)
60#if MIN_VERSION_base(4, 8, 0)
73#if !MIN_VERSION_base(4, 9, 0)
61#if !MIN_VERSION_base(4, 9, 0)
74import GHC.SrcLoc
62import GHC.SrcLoc
@@ -76,7 +64,7 @@ import GHC.SrcLoc
76import GHC.Stack
64import GHC.Stack
78import Language.Haskell.TH
66import Language.Haskell.TH
79−import qualified Language.Haskell.TH.Syntax as TH
67+import qualified Language.Haskell.TH.Syntax as TH
80import Lens.Micro
68import Lens.Micro
81import Lens.Micro.TH
69import Lens.Micro.TH
82import Network.HostName
70import Network.HostName
@@ -103,7 +91,7 @@ readMay s = case [x | (x,t) <- reads s, ("","") <- lex t] of
103-- IsString/OverloadedStrings, so "foo" will result in Namespace
91-- IsString/OverloadedStrings, so "foo" will result in Namespace
104-- ["foo"].
92-- ["foo"].
105newtype Namespace = Namespace { unNamespace :: [Text] }
93newtype Namespace = Namespace { unNamespace :: [Text] }
106− deriving (Eq,Show,Read,Ord,Generic,ToJSON,FromJSON,SG.Semigroup,Monoid)
94+ deriving (Eq,Show,Read,Ord,Generic,ToJSON,FromJSON,Semigroup,Monoid)
108instance IsString Namespace where
96instance IsString Namespace where
109 fromString s = Namespace [fromString s]
97 fromString s = Namespace [fromString s]
@@ -143,7 +131,7 @@ data Severity
143-- - 'V3' implies the maximum amount of payload information.
131-- - 'V3' implies the maximum amount of payload information.
144-- - Anything in between is left to the discretion of the developer.
132-- - Anything in between is left to the discretion of the developer.
145data Verbosity = V0 | V1 | V2 | V3
133data Verbosity = V0 | V1 | V2 | V3
146− deriving (Eq, Ord, Show, Read, Generic, Enum, Bounded)
134+ deriving (Eq, Ord, Show, Read, Generic, Enum)
149-------------------------------------------------------------------------------
137-------------------------------------------------------------------------------
@@ -184,26 +172,11 @@ instance FromJSON Severity where
184 Just x -> return x
172 Just x -> return x
185 Nothing -> fail $ "Invalid Severity " ++ toS t
173 Nothing -> fail $ "Invalid Severity " ++ toS t
187−instance ToJSON Verbosity where
188− toJSON s = A.String $ case s of
194−instance FromJSON Verbosity where
195− parseJSON = A.withText "Verbosity" $ \s -> case s of
200− _ -> fail $ "Invalid Verbosity " ++ toS s
203-------------------------------------------------------------------------------
176-------------------------------------------------------------------------------
204−-- | Log message with Builder underneath; use '<>' to concat in O(1).
177+-- | Log message with Builder unerneath; use '<>' to concat in O(1).
205newtype LogStr = LogStr { unLogStr :: B.Builder }
178newtype LogStr = LogStr { unLogStr :: B.Builder }
206− deriving (Generic, Show, Eq)
179+ deriving (Generic, Show)
208instance IsString LogStr where
181instance IsString LogStr where
209 fromString = LogStr . B.fromString
182 fromString = LogStr . B.fromString
@@ -225,7 +198,7 @@ instance FromJSON LogStr where
226-------------------------------------------------------------------------------
199-------------------------------------------------------------------------------
227-- | Pack any string-like thing into a 'LogStr'. This will
200-- | Pack any string-like thing into a 'LogStr'. This will
228−-- automatically work on 'String', 'ByteString', 'Text' and any of the
201+-- automatically work on 'String', 'ByteString, 'Text' and any of the
229-- lazy variants.
202-- lazy variants.
230logStr :: StringConv a Text => a -> LogStr
203logStr :: StringConv a Text => a -> LogStr
231logStr t = LogStr (B.fromText $ toS t)
204logStr t = LogStr (B.fromText $ toS t)
@@ -250,9 +223,7 @@ newtype ThreadIdText = ThreadIdText {
252mkThreadIdText :: ThreadId -> ThreadIdText
225mkThreadIdText :: ThreadId -> ThreadIdText
253−mkThreadIdText = ThreadIdText . stripPrefix' "ThreadId " . T.pack . show
226+mkThreadIdText = ThreadIdText . T.pack . show
255− stripPrefix' pfx t = fromMaybe t (T.stripPrefix pfx t)
258-------------------------------------------------------------------------------
229-------------------------------------------------------------------------------
@@ -272,62 +243,31 @@ data Item a = Item {
272 } deriving (Generic, Functor)
243 } deriving (Generic, Functor)
273makeLenses ''Item
244makeLenses ''Item
275−-- Manual instance because 'Loc' has no 'Eq' and 'Show' instances in old
276−-- versions of template-haskell (< 2.10)
277−instance Eq a => Eq (Item a) where
278− a == b = FT.and [ _itemApp a == _itemApp b
279− , _itemEnv a == _itemEnv b
280− , _itemSeverity a == _itemSeverity b
281− , _itemThread a == _itemThread b
282− , _itemHost a == _itemHost b
283− , _itemProcess a == _itemProcess b
284− , _itemPayload a == _itemPayload b
285− , _itemMessage a == _itemMessage b
286− , _itemTime a == _itemTime b
287− , _itemNamespace a == _itemNamespace b
288− , case (_itemLoc a, _itemLoc b) of
289− (Nothing, Nothing) -> True
290− (Just l1, Just l2) -> FT.and [ loc_filename l1 == loc_filename l2
291− , loc_package l1 == loc_package l2
292− , loc_module l1 == loc_module l2
293− , loc_start l1 == loc_start l2
294− , loc_end l1 == loc_end l2
299instance Show a => Show (Item a) where
247instance Show a => Show (Item a) where
300− showsPrec d Item{..} = showParen (d >= 11) ( showString "Item {"
248+ show Item{..} = "Item {_itemApp = " ++ show _itemApp ++ ", " ++
301− . field "_itemApp" _itemApp
249+ "_itemEnv = " ++ show _itemEnv ++ ", " ++
302− . field "_itemEnv" _itemEnv
303− . field "_itemSeverity" _itemSeverity
250+ "_itemSeverity = " ++ show _itemSeverity ++ ", " ++
304− . field "_itemThread" _itemThread
251+ "_itemThread = " ++ show _itemThread ++ ", " ++
305− . field "_itemHost" _itemHost
252+ "_itemHost = " ++ show _itemHost ++ ", " ++
306− . field "_itemProcess" _itemProcess
253+ "_itemProcess = " ++ show _itemProcess ++ ", " ++
307− . field "_itemPayload" _itemPayload
254+ "_itemPayload = " ++ show _itemPayload ++ ", " ++
308− . field "_itemMessage" _itemMessage
255+ "_itemMessage = " ++ show _itemMessage ++ ", " ++
309− . field "_itemTime" _itemTime
256+ "_itemTime = " ++ show _itemTime ++ ", " ++
310− . field "_itemNamespace" _itemNamespace
257+ "_itemNamespace = " ++ show _itemNamespace ++ ", " ++
311− . showString "_itemLoc = " . shows (LocShow <$> _itemLoc)
258+ "_itemLoc = " ++ show (LocShow <$> _itemLoc) ++ "}"
315− field n v = showString n . showString " = " . shows v . showString ", "
317newtype LocShow = LocShow Loc
261newtype LocShow = LocShow Loc
320instance Show LocShow where
264instance Show LocShow where
321− showsPrec d (LocShow Loc{..}) = showParen (d >= 11) ( showString "Loc {"
265+ show (LocShow Loc{..}) =
322− . field "loc_filename" loc_filename
266+ "Loc {loc_filename = " ++ show loc_filename ++ ", " ++
323− . field "loc_package" loc_package
267+ "loc_package = " ++ show loc_package ++ ", " ++
324− . field "loc_module" loc_module
268+ "loc_module = " ++ show loc_module ++ ", " ++
325− . field "loc_start" loc_start
269+ "loc_start = " ++ show loc_start ++ ", " ++
326− . showString "loc_end = " . shows loc_end
270+ "loc_end = " ++ show loc_end ++ "}"
330− field n v = showString n . showString " = " . shows v . showString ", "
333instance ToJSON a => ToJSON (Item a) where
273instance ToJSON a => ToJSON (Item a) where
@@ -540,93 +480,52 @@ itemJson verb a = toJSON $ a & itemPayload %~ payloadObject verb
541-- Scribes should always take a 'Severity' and 'Verbosity'.
481-- Scribes should always take a 'Severity' and 'Verbosity'.
543−-- Severity is used to __exclude log messages__ that are lower than
483+-- Severity is used to *exclude log messages* that are < the provided
544−-- the provided Severity. For instance, if the user passes InfoS,
484+-- Severity. For instance, if the user passes InfoS, DebugS items
545−-- DebugS items should be ignored. Katip provides the 'permitItem'
485+-- should be ignored. Katip provides the 'permitItem' utility for this.
546−-- utility for this. The user or the scribe may use 'permitAND' and
547−-- 'permitOR' to further customize this filtering, even dynamically if
550-- Verbosity is used to select keys from the log item's payload. Each
487-- Verbosity is used to select keys from the log item's payload. Each
551-- 'LogItem' instance describes what keys should be retained for each
488-- 'LogItem' instance describes what keys should be retained for each
552-- Verbosity level. Use the 'payloadObject' utility for extracting the keys
489-- Verbosity level. Use the 'payloadObject' utility for extracting the keys
553−-- that should be written.
490+-- that should be permitted.
555−-- Scribes provide a finalizer IO action ('scribeFinalizer') that is
492+-- There is no built-in mechanism in katip for telling a scribe that
556−-- meant to synchronously flush any remaining writes and clean up any
493+-- its time to shut down. 'unregisterScribe' merely drops it from the
557−-- resources acquired when the scribe was created. Internally, katip
494+-- 'LogEnv'. This means there are 2 ways to handle resources as a scribe:
558−-- keeps a buffer for each scribe's writes. When 'closeScribe' or
559−-- 'closeScribes' is called, that buffer stops accepting new log
560−-- messages and after the last item in its buffer is sent to 'liPush',
561−-- calls the finalizer. Thus, when the finalizer returns, katip can
562−-- assume that all resources are cleaned up and all log messages are
565−-- While katip internally buffers messages per 'ScribeSettings', it
496+-- 1. Pass in the resource when the scribe is created. Handle
566−-- sends them one at a time to the scribe. Depending on the scribe
497+-- allocation and release of the resource elsewhere. This is what the
567−-- itself, it may make sense for that scribe to keep its own internal
498+-- Handle scribe does.
568−-- buffer to batch-send logs if writing items one at a time is not
499+--
569−-- efficient. The scribe implementer must be sure that on
500+-- 2. Return a finalizing function that tells the scribe to shut
570−-- finalization, all writes are committed synchronously.
501+-- down. @katip-elasticsearch@'s @mkEsScribe@ returns a @IO (Scribe,
571−
502+-- IO ())@. The finalizer will flush any queued log messages and shut
572−-- | Signature of a function passed to `Scribe` constructor and
503+-- down gracefully before returning. This can be hooked into your
573−-- mkScribe* functions that decides which messages to be
504+-- application's shutdown routine to ensure you never miss any log
574−-- logged. Typically filters based on 'Severity', but can be
505+-- messages on shutdown.
575−-- combined with other, custom logic with 'permitAND' and 'permitOR'
576−type PermitFunc = forall a. Item a -> IO Bool
579−-- | AND together 2 permit functions
580−permitAND :: PermitFunc -> PermitFunc -> PermitFunc
581−permitAND f1 f2 = \a -> liftA2 (&&) (f1 a) (f2 a)
583−-- | OR together 2 permit functions
584−permitOR :: PermitFunc -> PermitFunc -> PermitFunc
585−permitOR f1 f2 = \a -> liftA2 (||) (f1 a) (f2 a)
588data Scribe = Scribe {
506data Scribe = Scribe {
589− liPush :: forall a. LogItem a => Item a -> IO ()
507+ liPush :: forall a. LogItem a => Item a -> IO ()
590− -- ^ How do we write an item to the scribe's output?
591− , scribeFinalizer :: IO ()
508+ , scribeFinalizer :: IO ()
592− -- ^ Provide a __blocking__ finalizer to call when your scribe is
509+ -- ^ Provide a *blocking* finalizer to call when your scribe is
593− -- removed. All pending writes should be flushed synchronously. If
594− -- this is not relevant to your scribe, return () is fine.
510+ -- removed. If this is not relevant to your scribe, return () is
595− , scribePermitItem :: PermitFunc
511+ -- fine.
596− -- ^ Provide a filtering function to allow the item to be logged,
597− -- or not. It can check Severity or some string in item's
598− -- body. The initial value of this is usually created from
599− -- 'permitItem'. Scribes and users can customize this by ANDing
600− -- or ORing onto the default with 'permitAND' or 'permitOR'
604−whenM :: Monad m => m Bool -> m () -> m ()
605−whenM mbool = (>>=) mbool . flip when
608−-- | Combine two scribes. Publishes to the left scribe if the left
609−-- would permit the item and to the right scribe if the right would
610−-- permit the item. Finalizers are called in sequence from left to
612instance Semigroup Scribe where
515instance Semigroup Scribe where
613− (Scribe pushA finA permitA) <> (Scribe pushB finB permitB) =
516+ (Scribe pushA finA) <> (Scribe pushB finB) =
614− Scribe (\item -> whenM (permitA item) (pushA item)
615− >> whenM (permitB item) (pushB item)
617− (finA `finally` finB)
517+ Scribe (\item -> pushA item >> pushB item) (finA `finally` finB)
618− (permitOR permitA permitB)
621instance Monoid Scribe where
520instance Monoid Scribe where
622− mempty = Scribe (const (return ())) (return ()) (permitItem DebugS)
521+ mempty = Scribe (const (return ())) (return ())
623 mappend = (<>)
522 mappend = (<>)
626-------------------------------------------------------------------------------
525-------------------------------------------------------------------------------
627data ScribeHandle = ScribeHandle {
526data ScribeHandle = ScribeHandle {
628 shScribe :: Scribe
527 shScribe :: Scribe
629− , shChan :: BQ.TBQueue WorkerMessage
528+ , shChan :: BQ.TBQueue WorkerMessage
@@ -638,9 +537,8 @@ data WorkerMessage where
639-------------------------------------------------------------------------------
538-------------------------------------------------------------------------------
640-- | Should this item be logged given the user's maximum severity?
539-- | Should this item be logged given the user's maximum severity?
641−-- Most new scribes will use this as a base for their 'PermitFunc'
642−permitItem :: Monad m => Severity -> Item a -> m Bool
540+permitItem :: Severity -> Item a -> Bool
643−permitItem sev item = return (_itemSeverity item >= sev)
541+permitItem sev i = _itemSeverity i >= sev
646-------------------------------------------------------------------------------
544-------------------------------------------------------------------------------
@@ -665,10 +563,10 @@ makeLenses ''LogEnv
667-------------------------------------------------------------------------------
565-------------------------------------------------------------------------------
668−-- | Create a reasonable default InitLogEnv. Uses an 'AutoUpdate' which
566+-- | Create a reasonable default InitLogEnv. Uses an 'AutoUdate' with
669−-- updates the timer every 1ms. If you need even more timestamp
567+-- the default settings as the timer. If you are concerned about
670−-- precision at the cost of performance, consider setting
568+-- timestamp precision or event ordering in log outputs like
671−-- '_logEnvTimer' with 'getCurrentTime'.
569+-- ElasticSearch, you should replace the timer with 'getCurrentTime'
672initLogEnv
570initLogEnv
673 :: Namespace
571 :: Namespace
674 -- ^ A base namespace for this application
572 -- ^ A base namespace for this application
@@ -680,15 +578,13 @@ initLogEnv an env = LogEnv
680 <*> getProcessID
578 <*> getProcessID
681 <*> pure an
579 <*> pure an
682 <*> pure env
580 <*> pure env
683− <*> mkAutoUpdate defaultUpdateSettings { updateAction = getCurrentTime, updateFreq = 1000 }
581+ <*> mkAutoUpdate defaultUpdateSettings { updateAction = getCurrentTime }
684 <*> pure mempty
582 <*> pure mempty
687-------------------------------------------------------------------------------
585-------------------------------------------------------------------------------
688-- | Add a scribe to the list. All future log calls will go to this
586-- | Add a scribe to the list. All future log calls will go to this
689−-- scribe in addition to the others. Writes will be buffered per the
587+-- scribe in addition to the others.
690−-- ScribeSettings to prevent slow scribes from slowing down
691−-- logging. Writes will be dropped if the buffer fills.
692registerScribe
588registerScribe
694 -- ^ Name the scribe
590 -- ^ Name the scribe
@@ -697,7 +593,7 @@ registerScribe
697 -> LogEnv
593 -> LogEnv
698 -> IO LogEnv
594 -> IO LogEnv
699registerScribe nm scribe ScribeSettings {..} le = do
595registerScribe nm scribe ScribeSettings {..} le = do
700− queue <- atomically (BQ.newTBQueue (fromIntegral _scribeBufferSize))
596+ queue <- atomically (BQ.newTBQueue _scribeBufferSize)
701 worker <- spawnScribeWorker scribe queue
597 worker <- spawnScribeWorker scribe queue
702 let fin = do
598 let fin = do
703 atomically (BQ.writeTBQueue queue PoisonPill)
599 atomically (BQ.writeTBQueue queue PoisonPill)
@@ -712,7 +608,7 @@ registerScribe nm scribe ScribeSettings {..} le = do
713-------------------------------------------------------------------------------
609-------------------------------------------------------------------------------
714spawnScribeWorker :: Scribe -> BQ.TBQueue WorkerMessage -> IO (Async.Async ())
610spawnScribeWorker :: Scribe -> BQ.TBQueue WorkerMessage -> IO (Async.Async ())
715−spawnScribeWorker (Scribe write _ _) queue = Async.async go
611+spawnScribeWorker (Scribe write _) queue = Async.async go
718 newCmd <- atomically (BQ.readTBQueue queue)
614 newCmd <- atomically (BQ.readTBQueue queue)
@@ -729,7 +625,6 @@ spawnScribeWorker (Scribe write _ _) queue = Async.async go
729data ScribeSettings = ScribeSettings {
625data ScribeSettings = ScribeSettings {
730 _scribeBufferSize :: Int
626 _scribeBufferSize :: Int
734makeLenses ''ScribeSettings
629makeLenses ''ScribeSettings
@@ -741,7 +636,7 @@ defaultScribeSettings = ScribeSettings 4096
743-------------------------------------------------------------------------------
638-------------------------------------------------------------------------------
744−-- | Remove a scribe from the environment. This does __not__ finalize
639+-- | Remove a scribe from the environment. This does *not* finalize
745-- the scribe. This mainly only makes sense to use with something like
640-- the scribe. This mainly only makes sense to use with something like
746-- MonadReader's @local@ function to temporarily disavow a single
641-- MonadReader's @local@ function to temporarily disavow a single
747-- logger for a block of code.
642-- logger for a block of code.
@@ -754,7 +649,7 @@ unregisterScribe nm = logEnvScribes %~ M.delete nm
756-------------------------------------------------------------------------------
651-------------------------------------------------------------------------------
757−-- | Unregister __all__ scribes. Note that this is __not__ for closing or
652+-- | Unregister *all* scribes. Note that this is *not* for closing or
758-- finalizing scribes, use 'closeScribes' for that. This mainly only
653-- finalizing scribes, use 'closeScribes' for that. This mainly only
759-- makes sense to use with something like MonadReader's @local@
654-- makes sense to use with something like MonadReader's @local@
760-- function to temporarily disavow any loggers for a block of code.
655-- function to temporarily disavow any loggers for a block of code.
@@ -766,10 +661,9 @@ clearScribes = logEnvScribes .~ mempty
767-------------------------------------------------------------------------------
662-------------------------------------------------------------------------------
768-- | Finalize a scribe. The scribe is removed from the environment,
663-- | Finalize a scribe. The scribe is removed from the environment,
769−-- its finalizer is called so that it can never be written to again
664+-- its finalizer is called and it can never be written to again. Note
770−-- and all pending writes are flushed. Note that this will throw any
771−-- exceptions yoru finalizer will throw, and that LogEnv is immutable,
665+-- that this will throw any exceptions yoru finalizer will throw, and
772−-- so it will not be removed in that case.
666+-- that LogEnv is immutable, so it will not be removed in that case.
773closeScribe
667closeScribe
775 -- ^ Name of the scribe
669 -- ^ Name of the scribe
@@ -793,7 +687,7 @@ closeScribes le = do
793 -- We want to run every finalizer here so we'll not save
687 -- We want to run every finalizer here so we'll not save
794 -- intermediate logenvs and just clear scribes at the end.
688 -- intermediate logenvs and just clear scribes at the end.
795 let actions = [void (closeScribe k le) | k <- M.keys (_logEnvScribes le)]
689 let actions = [void (closeScribe k le) | k <- M.keys (_logEnvScribes le)]
796− FT.foldr finally (return ()) actions
690+ foldr finally (return ()) actions
797 return (le & logEnvScribes .~ mempty)
691 return (le & logEnvScribes .~ mempty)
@@ -807,86 +701,44 @@ closeScribes le = do
807-- which keeps a namespace and merged context. You can write simple
701-- which keeps a namespace and merged context. You can write simple
808-- functions that add additional namespacing and merges additional
702-- functions that add additional namespacing and merges additional
809-- context on the fly.
703-- context on the fly.
811−-- 'localLogEnv' was added to allow for lexically-scoped modifications
812−-- of the log env that are reverted when the supplied monad
813−-- completes. 'katipNoLogging', for example, uses this to temporarily
814−-- pause log outputs.
815class MonadIO m => Katip m where
704class MonadIO m => Katip m where
816 getLogEnv :: m LogEnv
705 getLogEnv :: m LogEnv
817− localLogEnv :: (LogEnv -> LogEnv) -> m a -> m a
820instance Katip m => Katip (ReaderT s m) where
708instance Katip m => Katip (ReaderT s m) where
821 getLogEnv = lift getLogEnv
709 getLogEnv = lift getLogEnv
822− localLogEnv = mapReaderT . localLogEnv
825−#if !MIN_VERSION_either(4, 5, 0)
826instance Katip m => Katip (EitherT s m) where
712instance Katip m => Katip (EitherT s m) where
827 getLogEnv = lift getLogEnv
713 getLogEnv = lift getLogEnv
828− localLogEnv = mapEitherT . localLogEnv
832instance Katip m => Katip (ExceptT s m) where
715instance Katip m => Katip (ExceptT s m) where
833 getLogEnv = lift getLogEnv
716 getLogEnv = lift getLogEnv
834− localLogEnv = mapExceptT . localLogEnv
837instance Katip m => Katip (MaybeT m) where
718instance Katip m => Katip (MaybeT m) where
838 getLogEnv = lift getLogEnv
719 getLogEnv = lift getLogEnv
839− localLogEnv = mapMaybeT . localLogEnv
842instance Katip m => Katip (StateT s m) where
722instance Katip m => Katip (StateT s m) where
843 getLogEnv = lift getLogEnv
723 getLogEnv = lift getLogEnv
844− localLogEnv = mapStateT . localLogEnv
847−instance (Katip m, Monoid w) => Katip (RWST r w s m) where
848− getLogEnv = lift getLogEnv
849− localLogEnv = mapRWST . localLogEnv
852−instance (Katip m, Monoid w) => Katip (Strict.RWST r w s m) where
853− getLogEnv = lift getLogEnv
854− localLogEnv = Strict.mapRWST . localLogEnv
857−instance Katip m => Katip (Strict.StateT s m) where
858− getLogEnv = lift getLogEnv
859− localLogEnv = Strict.mapStateT . localLogEnv
862instance (Katip m, Monoid s) => Katip (WriterT s m) where
726instance (Katip m, Monoid s) => Katip (WriterT s m) where
863 getLogEnv = lift getLogEnv
727 getLogEnv = lift getLogEnv
864− localLogEnv = mapWriterT . localLogEnv
867−instance (Katip m, Monoid s) => Katip (Strict.WriterT s m) where
868− getLogEnv = lift getLogEnv
869− localLogEnv = Strict.mapWriterT . localLogEnv
872instance (Katip m) => Katip (ResourceT m) where
729instance (Katip m) => Katip (ResourceT m) where
873 getLogEnv = lift getLogEnv
730 getLogEnv = lift getLogEnv
874− localLogEnv = transResourceT . localLogEnv
877-------------------------------------------------------------------------------
733-------------------------------------------------------------------------------
878−-- | A concrete monad you can use to run logging actions. Use this if
734+-- | A concrete monad you can use to run logging actions.
879−-- you prefer an explicit monad transformer stack and adding layers as
880−-- opposed to implementing 'Katip' for your monad.
881newtype KatipT m a = KatipT { unKatipT :: ReaderT LogEnv m a }
735newtype KatipT m a = KatipT { unKatipT :: ReaderT LogEnv m a }
882 deriving ( Functor, Applicative, Monad, MonadIO
736 deriving ( Functor, Applicative, Monad, MonadIO
883− , MonadMask, MonadCatch, MonadThrow, MonadResource, MonadTrans
737+ , MonadMask, MonadCatch, MonadThrow, MonadTrans, MonadBase b)
887instance MonadIO m => Katip (KatipT m) where
740instance MonadIO m => Katip (KatipT m) where
888 getLogEnv = KatipT ask
741 getLogEnv = KatipT ask
889− localLogEnv f (KatipT m) = KatipT $ local f m
892instance MonadTransControl KatipT where
744instance MonadTransControl KatipT where
@@ -902,21 +754,6 @@ instance (MonadBaseControl b m) => MonadBaseControl b (KatipT m) where
902 liftBaseWith = defaultLiftBaseWith
754 liftBaseWith = defaultLiftBaseWith
903 restoreM = defaultRestoreM
755 restoreM = defaultRestoreM
905−instance MonadUnliftIO m => MonadUnliftIO (KatipT m) where
906−#if MIN_VERSION_unliftio_core(0, 2, 0)
907− withRunInIO inner = KatipT $ ReaderT $ \le -> withRunInIO $ \run ->
908− inner (run . runKatipT le)
910− askUnliftIO = KatipT $
911− withUnliftIO $ \u ->
912− pure (UnliftIO (unliftIO u . unKatipT))
915−#if MIN_VERSION_base(4, 9, 0)
916−instance MF.MonadFail m => MF.MonadFail (KatipT m) where
917− fail msg = lift (MF.fail msg)
921-------------------------------------------------------------------------------
758-------------------------------------------------------------------------------
922-- | Execute 'KatipT' on a log env.
759-- | Execute 'KatipT' on a log env.
@@ -924,17 +761,6 @@ runKatipT :: LogEnv -> KatipT m a -> m a
924runKatipT le (KatipT f) = runReaderT f le
761runKatipT le (KatipT f) = runReaderT f le
927−-------------------------------------------------------------------------------
928−-- | Disable all scribes for the given monadic action, then restore
929−-- them afterwards. Works in any Katip monad.
935−katipNoLogging = localLogEnv (\le -> set logEnvScribes mempty le)
938-------------------------------------------------------------------------------
764-------------------------------------------------------------------------------
939-- | Log with everything, including a source code location. This is
765-- | Log with everything, including a source code location. This is
940-- very low level and you typically can use 'logT' in its place.
766-- very low level and you typically can use 'logT' in its place.
@@ -948,32 +774,21 @@ logItem
949logItem a ns loc sev msg = do
775logItem a ns loc sev msg = do
950 LogEnv{..} <- getLogEnv
776 LogEnv{..} <- getLogEnv
951− logKatipItem =<< liftIO
777+ liftIO $ do
952− (Item <$> pure _logEnvApp
779+ <$> pure _logEnvApp
953− <*> pure _logEnvEnv
780+ <*> pure _logEnvEnv
954− <*> pure sev
781+ <*> pure sev
955− <*> (mkThreadIdText <$> myThreadId)
782+ <*> (mkThreadIdText <$> myThreadId)
956− <*> pure _logEnvHost
783+ <*> pure _logEnvHost
957− <*> pure _logEnvPid
784+ <*> pure _logEnvPid
958− <*> pure a
785+ <*> pure a
959− <*> pure msg
786+ <*> pure msg
960− <*> _logEnvTimer
787+ <*> _logEnvTimer
961− <*> pure (_logEnvApp <> ns)
788+ <*> pure (_logEnvApp <> ns)
962− <*> pure loc)
789+ <*> pure loc
964−-- | Log already constructed 'Item'. This is the lowest level function that other log*
966−-- It can be useful when implementing centralised logging services.
968− :: (A.Applicative m, LogItem a, Katip m)
971−logKatipItem item = do
972− LogEnv{..} <- getLogEnv
974− FT.forM_ (M.elems _logEnvScribes) $ \ ScribeHandle {..} -> do
975− whenM (scribePermitItem shScribe item) $
976− void $ atomically (tryWriteTBQueue shChan (NewItem item))
790+ FT.forM_ (M.elems _logEnvScribes) $ \ ScribeHandle {..} -> atomically (tryWriteTBQueue shChan (NewItem item))
978-------------------------------------------------------------------------------
793-------------------------------------------------------------------------------
979tryWriteTBQueue
794tryWriteTBQueue
@@ -986,7 +801,6 @@ tryWriteTBQueue q a = do
986 unless full (writeTBQueue q a)
801 unless full (writeTBQueue q a)
987 return (not full)
802 return (not full)
990-------------------------------------------------------------------------------
804-------------------------------------------------------------------------------
991-- | Log with full context, but without any code location.
805-- | Log with full context, but without any code location.
@@ -1019,7 +833,7 @@ logException
1019logException a ns sev action = action `catchAny` \e -> f e >> throwM e
833logException a ns sev action = action `catchAny` \e -> f e >> throwM e
1021 f e = logF a ns sev (msg e)
835 f e = logF a ns sev (msg e)
1022− msg e = ls (T.pack "An exception has occurred: ") <> showLS e
836+ msg e = ls (T.pack "An exception has occured: ") <> showLS e
1025-------------------------------------------------------------------------------
839-------------------------------------------------------------------------------
@@ -1073,15 +887,11 @@ liftLoc (Loc a b c (d1, d2) (e1, e2)) = [|Loc
1073-- fill the 'Maybe Loc' gap in 'logF' of this module, and relies on implicit
887-- fill the 'Maybe Loc' gap in 'logF' of this module, and relies on implicit
1074-- callstacks when available (GHC > 7.8).
888-- callstacks when available (GHC > 7.8).
1075#if MIN_VERSION_base(4, 8, 0)
889#if MIN_VERSION_base(4, 8, 0)
1076−getLoc :: HasCallStack => Maybe Loc
890+getLoc :: (?loc :: CallStack) => Maybe Loc
1077−getLoc = case getCallStack callStack of
891+getLoc = case getCallStack ?loc of
1078 [] -> Nothing
892 [] -> Nothing
1079− xs -> Just . toLoc . head $ filter filterKatip xs
893+ xs -> Just . toLoc . last $ xs
1081− filterKatip :: (String, SrcLoc) -> Bool
1082− filterKatip (_, srcloc) = not $
1083− "katip-" `isPrefixOf` srcLocPackage srcloc
1085 toLoc :: (String, SrcLoc) -> Loc
895 toLoc :: (String, SrcLoc) -> Loc
1086 toLoc (_, l) = Loc {
896 toLoc (_, l) = Loc {
1087 loc_filename = srcLocFile l
897 loc_filename = srcLocFile l
@@ -1112,7 +922,7 @@ logT = [| \ a ns sev msg -> logItem a ns (Just $(getLocTH)) sev msg |]
1114-------------------------------------------------------------------------------
924-------------------------------------------------------------------------------
1115−-- | 'Loc'-tagged logging using 'GHC.Stack' when available.
925+-- | 'Loc'-tagged logging using implicit-callstacks when available.
1117-- This function does not require template-haskell as it
927-- This function does not require template-haskell as it
1118-- automatically uses <https://hackage.haskell.org/package/base-4.8.2.0/docs/GHC-Stack.html#v:getCallStack implicit-callstacks>
928-- automatically uses <https://hackage.haskell.org/package/base-4.8.2.0/docs/GHC-Stack.html#v:getCallStack implicit-callstacks>
@@ -1123,7 +933,7 @@ logT = [| \ a ns sev msg -> logItem a ns (Just $(getLocTH)) sev msg |]
1124-- @logLoc obj mempty InfoS "Hello world"@
934-- @logLoc obj mempty InfoS "Hello world"@
1125#if MIN_VERSION_base(4, 8, 0)
935#if MIN_VERSION_base(4, 8, 0)
1126−logLoc :: (Applicative m, LogItem a, Katip m, HasCallStack)
936+logLoc :: (Applicative m, LogItem a, Katip m, ?loc :: CallStack)
1128logLoc :: (Applicative m, LogItem a, Katip m)
938logLoc :: (Applicative m, LogItem a, Katip m)