@@ -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,44 @@
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, transResourceT)
49−import Control.Monad.Trans.RWS.Lazy (RWST, mapRWST)
43+import Control.Monad.Trans.State.Lazy (StateT, mapStateT)
50−import qualified Control.Monad.Trans.RWS.Strict as Strict (RWST, mapRWST)
44+import qualified Control.Monad.Trans.State.Strict as Strict (StateT, mapStateT)
51−import Control.Monad.Trans.State.Lazy (StateT, mapStateT)
45+import Control.Monad.Trans.Writer.Lazy (WriterT, mapWriterT)
52−import qualified Control.Monad.Trans.State.Strict as Strict (StateT, mapStateT)
46+import qualified Control.Monad.Trans.Writer.Strict as Strict (WriterT, mapWriterT)
53−import Control.Monad.Trans.Writer.Lazy (WriterT, mapWriterT)
47+import Control.Monad.Trans.RWS.Lazy (RWST, mapRWST)
54−import qualified Control.Monad.Trans.Writer.Strict as Strict (WriterT,
48+import qualified Control.Monad.Trans.RWS.Strict as Strict (RWST, mapRWST)
56−import Data.Aeson (FromJSON (..), ToJSON (..),
49+import Data.Aeson (FromJSON (..), ToJSON (..),
58−import qualified Data.Aeson as A
51+import qualified Data.Aeson as A
59−import Data.Foldable as FT
52+import Data.Foldable as FT
60−import qualified Data.HashMap.Strict as HM
53+import qualified Data.HashMap.Strict as HM
61import Data.List
54import Data.List
62−import qualified Data.Map.Strict as M
55+import qualified Data.Map.Strict as M
63−import Data.Maybe (fromMaybe)
56+import Data.Semigroup
64−import Data.Semigroup as SG
65import Data.String
57import Data.String
66import Data.String.Conv
58import Data.String.Conv
67−import Data.Text (Text)
59+import Data.Text (Text)
68−import qualified Data.Text as T
60+import qualified Data.Text as T
69−import qualified Data.Text.Lazy.Builder as B
61+import qualified Data.Text.Lazy.Builder as B
70import Data.Time
62import Data.Time
71−import GHC.Generics hiding (to)
63+import GHC.Generics hiding (to)
72#if MIN_VERSION_base(4, 8, 0)
64#if MIN_VERSION_base(4, 8, 0)
73#if !MIN_VERSION_base(4, 9, 0)
65#if !MIN_VERSION_base(4, 9, 0)
74import GHC.SrcLoc
66import GHC.SrcLoc
@@ -76,7 +68,7 @@ import GHC.SrcLoc
76import GHC.Stack
68import GHC.Stack
78import Language.Haskell.TH
70import Language.Haskell.TH
79−import qualified Language.Haskell.TH.Syntax as TH
71+import qualified Language.Haskell.TH.Syntax as TH
80import Lens.Micro
72import Lens.Micro
81import Lens.Micro.TH
73import Lens.Micro.TH
82import Network.HostName
74import Network.HostName
@@ -103,7 +95,7 @@ readMay s = case [x | (x,t) <- reads s, ("","") <- lex t] of
103-- IsString/OverloadedStrings, so "foo" will result in Namespace
95-- IsString/OverloadedStrings, so "foo" will result in Namespace
104-- ["foo"].
96-- ["foo"].
105newtype Namespace = Namespace { unNamespace :: [Text] }
97newtype Namespace = Namespace { unNamespace :: [Text] }
106− deriving (Eq,Show,Read,Ord,Generic,ToJSON,FromJSON,SG.Semigroup,Monoid)
98+ deriving (Eq,Show,Read,Ord,Generic,ToJSON,FromJSON,Semigroup,Monoid)
108instance IsString Namespace where
100instance IsString Namespace where
109 fromString s = Namespace [fromString s]
101 fromString s = Namespace [fromString s]
@@ -143,7 +135,7 @@ data Severity
143-- - 'V3' implies the maximum amount of payload information.
135-- - 'V3' implies the maximum amount of payload information.
144-- - Anything in between is left to the discretion of the developer.
136-- - Anything in between is left to the discretion of the developer.
145data Verbosity = V0 | V1 | V2 | V3
137data Verbosity = V0 | V1 | V2 | V3
146− deriving (Eq, Ord, Show, Read, Generic, Enum, Bounded)
138+ deriving (Eq, Ord, Show, Read, Generic, Enum)
149-------------------------------------------------------------------------------
141-------------------------------------------------------------------------------
@@ -184,21 +176,6 @@ instance FromJSON Severity where
184 Just x -> return x
176 Just x -> return x
185 Nothing -> fail $ "Invalid Severity " ++ toS t
177 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-------------------------------------------------------------------------------
180-------------------------------------------------------------------------------
204-- | Log message with Builder underneath; use '<>' to concat in O(1).
181-- | Log message with Builder underneath; use '<>' to concat in O(1).
@@ -250,9 +227,7 @@ newtype ThreadIdText = ThreadIdText {
252mkThreadIdText :: ThreadId -> ThreadIdText
229mkThreadIdText :: ThreadId -> ThreadIdText
253−mkThreadIdText = ThreadIdText . stripPrefix' "ThreadId " . T.pack . show
230+mkThreadIdText = ThreadIdText . T.pack . show
255− stripPrefix' pfx t = fromMaybe t (T.stripPrefix pfx t)
258-------------------------------------------------------------------------------
233-------------------------------------------------------------------------------
@@ -540,93 +515,52 @@ itemJson verb a = toJSON $ a & itemPayload %~ payloadObject verb
541-- Scribes should always take a 'Severity' and 'Verbosity'.
516-- Scribes should always take a 'Severity' and 'Verbosity'.
543−-- Severity is used to __exclude log messages__ that are lower than
518+-- Severity is used to *exclude log messages* that are < the provided
544−-- the provided Severity. For instance, if the user passes InfoS,
519+-- Severity. For instance, if the user passes InfoS, DebugS items
545−-- DebugS items should be ignored. Katip provides the 'permitItem'
520+-- 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
522-- Verbosity is used to select keys from the log item's payload. Each
551-- 'LogItem' instance describes what keys should be retained for each
523-- 'LogItem' instance describes what keys should be retained for each
552-- Verbosity level. Use the 'payloadObject' utility for extracting the keys
524-- Verbosity level. Use the 'payloadObject' utility for extracting the keys
553−-- that should be written.
525+-- that should be permitted.
555−-- Scribes provide a finalizer IO action ('scribeFinalizer') that is
527+-- 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
528+-- its time to shut down. 'unregisterScribe' merely drops it from the
557−-- resources acquired when the scribe was created. Internally, katip
529+-- '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
531+-- 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
532+-- 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
533+-- Handle scribe does.
568−-- buffer to batch-send logs if writing items one at a time is not
534+--
569−-- efficient. The scribe implementer must be sure that on
535+-- 2. Return a finalizing function that tells the scribe to shut
570−-- finalization, all writes are committed synchronously.
536+-- down. @katip-elasticsearch@'s @mkEsScribe@ returns an @IO (Scribe,
571−
537+-- IO ())@. The finalizer will flush any queued log messages and shut
572−-- | Signature of a function passed to `Scribe` constructor and
538+-- down gracefully before returning. This can be hooked into your
573−-- mkScribe* functions that decides which messages to be
539+-- application's shutdown routine to ensure you never miss any log
574−-- logged. Typically filters based on 'Severity', but can be
540+-- 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 {
541data Scribe = Scribe {
589− liPush :: forall a. LogItem a => Item a -> IO ()
542+ liPush :: forall a. LogItem a => Item a -> IO ()
590− -- ^ How do we write an item to the scribe's output?
591− , scribeFinalizer :: IO ()
543+ , scribeFinalizer :: IO ()
592− -- ^ Provide a __blocking__ finalizer to call when your scribe is
544+ -- ^ 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.
545+ -- removed. If this is not relevant to your scribe, return () is
595− , scribePermitItem :: PermitFunc
546+ -- 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
550instance Semigroup Scribe where
613− (Scribe pushA finA permitA) <> (Scribe pushB finB permitB) =
551+ (Scribe pushA finA) <> (Scribe pushB finB) =
614− Scribe (\item -> whenM (permitA item) (pushA item)
615− >> whenM (permitB item) (pushB item)
617− (finA `finally` finB)
552+ Scribe (\item -> pushA item >> pushB item) (finA `finally` finB)
618− (permitOR permitA permitB)
621instance Monoid Scribe where
555instance Monoid Scribe where
622− mempty = Scribe (const (return ())) (return ()) (permitItem DebugS)
556+ mempty = Scribe (const (return ())) (return ())
623 mappend = (<>)
557 mappend = (<>)
626-------------------------------------------------------------------------------
560-------------------------------------------------------------------------------
627data ScribeHandle = ScribeHandle {
561data ScribeHandle = ScribeHandle {
628 shScribe :: Scribe
562 shScribe :: Scribe
629− , shChan :: BQ.TBQueue WorkerMessage
563+ , shChan :: BQ.TBQueue WorkerMessage
@@ -638,9 +572,8 @@ data WorkerMessage where
639-------------------------------------------------------------------------------
573-------------------------------------------------------------------------------
640-- | Should this item be logged given the user's maximum severity?
574-- | 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
575+permitItem :: Severity -> Item a -> Bool
643−permitItem sev item = return (_itemSeverity item >= sev)
576+permitItem sev i = _itemSeverity i >= sev
646-------------------------------------------------------------------------------
579-------------------------------------------------------------------------------
@@ -665,10 +598,10 @@ makeLenses ''LogEnv
667-------------------------------------------------------------------------------
600-------------------------------------------------------------------------------
668−-- | Create a reasonable default InitLogEnv. Uses an 'AutoUpdate' which
601+-- | Create a reasonable default InitLogEnv. Uses an 'AutoUdate' with
669−-- updates the timer every 1ms. If you need even more timestamp
602+-- the default settings as the timer. If you are concerned about
670−-- precision at the cost of performance, consider setting
603+-- timestamp precision or event ordering in log outputs like
671−-- '_logEnvTimer' with 'getCurrentTime'.
604+-- ElasticSearch, you should replace the timer with 'getCurrentTime'
672initLogEnv
605initLogEnv
673 :: Namespace
606 :: Namespace
674 -- ^ A base namespace for this application
607 -- ^ A base namespace for this application
@@ -680,15 +613,13 @@ initLogEnv an env = LogEnv
680 <*> getProcessID
613 <*> getProcessID
681 <*> pure an
614 <*> pure an
682 <*> pure env
615 <*> pure env
683− <*> mkAutoUpdate defaultUpdateSettings { updateAction = getCurrentTime, updateFreq = 1000 }
616+ <*> mkAutoUpdate defaultUpdateSettings { updateAction = getCurrentTime }
684 <*> pure mempty
617 <*> pure mempty
687-------------------------------------------------------------------------------
620-------------------------------------------------------------------------------
688-- | Add a scribe to the list. All future log calls will go to this
621-- | 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
622+-- 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
623registerScribe
694 -- ^ Name the scribe
625 -- ^ Name the scribe
@@ -697,7 +628,7 @@ registerScribe
697 -> LogEnv
628 -> LogEnv
698 -> IO LogEnv
629 -> IO LogEnv
699registerScribe nm scribe ScribeSettings {..} le = do
630registerScribe nm scribe ScribeSettings {..} le = do
700− queue <- atomically (BQ.newTBQueue (fromIntegral _scribeBufferSize))
631+ queue <- atomically (BQ.newTBQueue _scribeBufferSize)
701 worker <- spawnScribeWorker scribe queue
632 worker <- spawnScribeWorker scribe queue
702 let fin = do
633 let fin = do
703 atomically (BQ.writeTBQueue queue PoisonPill)
634 atomically (BQ.writeTBQueue queue PoisonPill)
@@ -712,7 +643,7 @@ registerScribe nm scribe ScribeSettings {..} le = do
713-------------------------------------------------------------------------------
644-------------------------------------------------------------------------------
714spawnScribeWorker :: Scribe -> BQ.TBQueue WorkerMessage -> IO (Async.Async ())
645spawnScribeWorker :: Scribe -> BQ.TBQueue WorkerMessage -> IO (Async.Async ())
715−spawnScribeWorker (Scribe write _ _) queue = Async.async go
646+spawnScribeWorker (Scribe write _) queue = Async.async go
718 newCmd <- atomically (BQ.readTBQueue queue)
649 newCmd <- atomically (BQ.readTBQueue queue)
@@ -741,7 +672,7 @@ defaultScribeSettings = ScribeSettings 4096
743-------------------------------------------------------------------------------
674-------------------------------------------------------------------------------
744−-- | Remove a scribe from the environment. This does __not__ finalize
675+-- | Remove a scribe from the environment. This does *not* finalize
745-- the scribe. This mainly only makes sense to use with something like
676-- the scribe. This mainly only makes sense to use with something like
746-- MonadReader's @local@ function to temporarily disavow a single
677-- MonadReader's @local@ function to temporarily disavow a single
747-- logger for a block of code.
678-- logger for a block of code.
@@ -754,7 +685,7 @@ unregisterScribe nm = logEnvScribes %~ M.delete nm
756-------------------------------------------------------------------------------
687-------------------------------------------------------------------------------
757−-- | Unregister __all__ scribes. Note that this is __not__ for closing or
688+-- | Unregister *all* scribes. Note that this is *not* for closing or
758-- finalizing scribes, use 'closeScribes' for that. This mainly only
689-- finalizing scribes, use 'closeScribes' for that. This mainly only
759-- makes sense to use with something like MonadReader's @local@
690-- makes sense to use with something like MonadReader's @local@
760-- function to temporarily disavow any loggers for a block of code.
691-- function to temporarily disavow any loggers for a block of code.
@@ -766,10 +697,9 @@ clearScribes = logEnvScribes .~ mempty
767-------------------------------------------------------------------------------
698-------------------------------------------------------------------------------
768-- | Finalize a scribe. The scribe is removed from the environment,
699-- | Finalize a scribe. The scribe is removed from the environment,
769−-- its finalizer is called so that it can never be written to again
700+-- 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,
701+-- that this will throw any exceptions yoru finalizer will throw, and
772−-- so it will not be removed in that case.
702+-- that LogEnv is immutable, so it will not be removed in that case.
773closeScribe
703closeScribe
775 -- ^ Name of the scribe
705 -- ^ Name of the scribe
@@ -822,11 +752,9 @@ instance Katip m => Katip (ReaderT s m) where
822 localLogEnv = mapReaderT . localLogEnv
752 localLogEnv = mapReaderT . localLogEnv
825−#if !MIN_VERSION_either(4, 5, 0)
826instance Katip m => Katip (EitherT s m) where
755instance Katip m => Katip (EitherT s m) where
827 getLogEnv = lift getLogEnv
756 getLogEnv = lift getLogEnv
828 localLogEnv = mapEitherT . localLogEnv
757 localLogEnv = mapEitherT . localLogEnv
832instance Katip m => Katip (ExceptT s m) where
760instance Katip m => Katip (ExceptT s m) where
@@ -880,8 +808,7 @@ instance (Katip m) => Katip (ResourceT m) where
880-- opposed to implementing 'Katip' for your monad.
808-- opposed to implementing 'Katip' for your monad.
881newtype KatipT m a = KatipT { unKatipT :: ReaderT LogEnv m a }
809newtype KatipT m a = KatipT { unKatipT :: ReaderT LogEnv m a }
882 deriving ( Functor, Applicative, Monad, MonadIO
810 deriving ( Functor, Applicative, Monad, MonadIO
883− , MonadMask, MonadCatch, MonadThrow, MonadResource, MonadTrans
811+ , MonadMask, MonadCatch, MonadThrow, MonadTrans, MonadBase b)
887instance MonadIO m => Katip (KatipT m) where
814instance MonadIO m => Katip (KatipT m) where
@@ -902,21 +829,6 @@ instance (MonadBaseControl b m) => MonadBaseControl b (KatipT m) where
902 liftBaseWith = defaultLiftBaseWith
829 liftBaseWith = defaultLiftBaseWith
903 restoreM = defaultRestoreM
830 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-------------------------------------------------------------------------------
833-------------------------------------------------------------------------------
922-- | Execute 'KatipT' on a log env.
834-- | Execute 'KatipT' on a log env.
@@ -948,32 +860,21 @@ logItem
949logItem a ns loc sev msg = do
861logItem a ns loc sev msg = do
950 LogEnv{..} <- getLogEnv
862 LogEnv{..} <- getLogEnv
951− logKatipItem =<< liftIO
863+ liftIO $ do
952− (Item <$> pure _logEnvApp
865+ <$> pure _logEnvApp
953− <*> pure _logEnvEnv
866+ <*> pure _logEnvEnv
954− <*> pure sev
867+ <*> pure sev
955− <*> (mkThreadIdText <$> myThreadId)
868+ <*> (mkThreadIdText <$> myThreadId)
956− <*> pure _logEnvHost
869+ <*> pure _logEnvHost
957− <*> pure _logEnvPid
870+ <*> pure _logEnvPid
958− <*> pure a
871+ <*> pure a
959− <*> pure msg
872+ <*> pure msg
960− <*> _logEnvTimer
873+ <*> _logEnvTimer
961− <*> pure (_logEnvApp <> ns)
874+ <*> pure (_logEnvApp <> ns)
962− <*> pure loc)
875+ <*> 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))
876+ FT.forM_ (M.elems _logEnvScribes) $ \ ScribeHandle {..} -> atomically (tryWriteTBQueue shChan (NewItem item))
978-------------------------------------------------------------------------------
879-------------------------------------------------------------------------------
979tryWriteTBQueue
880tryWriteTBQueue
@@ -986,7 +887,6 @@ tryWriteTBQueue q a = do
986 unless full (writeTBQueue q a)
887 unless full (writeTBQueue q a)
987 return (not full)
888 return (not full)
990-------------------------------------------------------------------------------
890-------------------------------------------------------------------------------
991-- | Log with full context, but without any code location.
891-- | Log with full context, but without any code location.
@@ -1019,7 +919,7 @@ logException
1019logException a ns sev action = action `catchAny` \e -> f e >> throwM e
919logException a ns sev action = action `catchAny` \e -> f e >> throwM e
1021 f e = logF a ns sev (msg e)
921 f e = logF a ns sev (msg e)
1022− msg e = ls (T.pack "An exception has occurred: ") <> showLS e
922+ msg e = ls (T.pack "An exception has occured: ") <> showLS e
1025-------------------------------------------------------------------------------
925-------------------------------------------------------------------------------
@@ -1073,15 +973,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
973-- fill the 'Maybe Loc' gap in 'logF' of this module, and relies on implicit
1074-- callstacks when available (GHC > 7.8).
974-- callstacks when available (GHC > 7.8).
1075#if MIN_VERSION_base(4, 8, 0)
975#if MIN_VERSION_base(4, 8, 0)
1076−getLoc :: HasCallStack => Maybe Loc
976+getLoc :: (?loc :: CallStack) => Maybe Loc
1077−getLoc = case getCallStack callStack of
977+getLoc = case getCallStack ?loc of
1078 [] -> Nothing
978 [] -> Nothing
1079− xs -> Just . toLoc . head $ filter filterKatip xs
979+ xs -> Just . toLoc . last $ xs
1081− filterKatip :: (String, SrcLoc) -> Bool
1082− filterKatip (_, srcloc) = not $
1083− "katip-" `isPrefixOf` srcLocPackage srcloc
1085 toLoc :: (String, SrcLoc) -> Loc
981 toLoc :: (String, SrcLoc) -> Loc
1086 toLoc (_, l) = Loc {
982 toLoc (_, l) = Loc {
1087 loc_filename = srcLocFile l
983 loc_filename = srcLocFile l
@@ -1112,7 +1008,7 @@ logT = [| \ a ns sev msg -> logItem a ns (Just $(getLocTH)) sev msg |]
1114-------------------------------------------------------------------------------
1010-------------------------------------------------------------------------------
1115−-- | 'Loc'-tagged logging using 'GHC.Stack' when available.
1011+-- | 'Loc'-tagged logging using implicit-callstacks when available.
1117-- This function does not require template-haskell as it
1013-- 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>
1014-- automatically uses <https://hackage.haskell.org/package/base-4.8.2.0/docs/GHC-Stack.html#v:getCallStack implicit-callstacks>
@@ -1123,7 +1019,7 @@ logT = [| \ a ns sev msg -> logItem a ns (Just $(getLocTH)) sev msg |]
1124-- @logLoc obj mempty InfoS "Hello world"@
1020-- @logLoc obj mempty InfoS "Hello world"@
1125#if MIN_VERSION_base(4, 8, 0)
1021#if MIN_VERSION_base(4, 8, 0)
1126−logLoc :: (Applicative m, LogItem a, Katip m, HasCallStack)
1022+logLoc :: (Applicative m, LogItem a, Katip m, ?loc :: CallStack)
1128logLoc :: (Applicative m, LogItem a, Katip m)
1024logLoc :: (Applicative m, LogItem a, Katip m)