@@ -1,11 +1,12 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2+{-# LANGUAGE DefaultSignatures #-}
2{-# LANGUAGE DeriveFunctor #-}
3{-# LANGUAGE DeriveFunctor #-}
3{-# LANGUAGE DeriveGeneric #-}
4{-# LANGUAGE DeriveGeneric #-}
4{-# LANGUAGE ExistentialQuantification #-}
5{-# LANGUAGE ExistentialQuantification #-}
5{-# LANGUAGE FlexibleContexts #-}
6{-# LANGUAGE FlexibleContexts #-}
6{-# LANGUAGE FlexibleInstances #-}
7{-# LANGUAGE FlexibleInstances #-}
7{-# LANGUAGE GeneralizedNewtypeDeriving #-}
9{-# LANGUAGE GeneralizedNewtypeDeriving #-}
8−{-# LANGUAGE ImplicitParams #-}
9{-# LANGUAGE MultiParamTypeClasses #-}
10{-# LANGUAGE MultiParamTypeClasses #-}
10{-# LANGUAGE OverloadedStrings #-}
11{-# LANGUAGE OverloadedStrings #-}
11{-# LANGUAGE RankNTypes #-}
12{-# LANGUAGE RankNTypes #-}
@@ -21,36 +22,53 @@
21module Katip.Core where
22module Katip.Core where
23-------------------------------------------------------------------------------
24-------------------------------------------------------------------------------
24−import Control.Applicative as A
25+import Control.Applicative as A
25import Control.AutoUpdate
26import Control.AutoUpdate
26import Control.Concurrent
27import Control.Concurrent
28+import qualified Control.Concurrent.Async as Async
29+import Control.Concurrent.STM
30+import qualified Control.Concurrent.STM.TBQueue as BQ
31+import Control.Exception.Safe
32+import Control.Monad (unless, void, when)
27import Control.Monad.Base
33import Control.Monad.Base
34+#if MIN_VERSION_base(4, 9, 0)
28−import Control.Monad.Catch
35+import qualified Control.Monad.Fail as MF
29import Control.Monad.IO.Class
37import Control.Monad.IO.Class
38+import Control.Monad.IO.Unlift
30import Control.Monad.Trans.Class
39import Control.Monad.Trans.Class
31import Control.Monad.Trans.Control
40import Control.Monad.Trans.Control
41+#if !MIN_VERSION_either(4, 5, 0)
32import Control.Monad.Trans.Either
42import Control.Monad.Trans.Either
33import Control.Monad.Trans.Except
44import Control.Monad.Trans.Except
34import Control.Monad.Trans.Maybe
45import Control.Monad.Trans.Maybe
35import Control.Monad.Trans.Reader
46import Control.Monad.Trans.Reader
36−import Control.Monad.Trans.Resource
47+import Control.Monad.Trans.Resource (MonadResource, ResourceT,
37−import Control.Monad.Trans.State
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)
52+import qualified Control.Monad.Trans.State.Strict as Strict (StateT, mapStateT)
38−import Control.Monad.Trans.Writer
53+import Control.Monad.Trans.Writer.Lazy (WriterT, mapWriterT)
54+import qualified Control.Monad.Trans.Writer.Strict as Strict (WriterT,
39−import Data.Aeson (FromJSON (..), ToJSON (..),
56+import Data.Aeson (FromJSON (..), ToJSON (..),
41−import qualified Data.Aeson as A
58+import qualified Data.Aeson as A
42−import Data.Foldable as FT
59+import Data.Foldable as FT
43−import qualified Data.HashMap.Strict as HM
60+import qualified Data.HashMap.Strict as HM
44import Data.List
61import Data.List
45−import qualified Data.Map.Strict as M
62+import qualified Data.Map.Strict as M
46−import Data.Semigroup
63+import Data.Maybe (fromMaybe)
64+import Data.Semigroup as SG
47import Data.String
65import Data.String
48import Data.String.Conv
66import Data.String.Conv
49−import Data.Text (Text)
67+import Data.Text (Text)
50−import qualified Data.Text as T
68+import qualified Data.Text as T
51−import qualified Data.Text.Lazy.Builder as B
69+import qualified Data.Text.Lazy.Builder as B
52import Data.Time
70import Data.Time
53−import GHC.Generics hiding (to)
71+import GHC.Generics hiding (to)
54#if MIN_VERSION_base(4, 8, 0)
72#if MIN_VERSION_base(4, 8, 0)
55#if !MIN_VERSION_base(4, 9, 0)
73#if !MIN_VERSION_base(4, 9, 0)
56import GHC.SrcLoc
74import GHC.SrcLoc
@@ -58,19 +76,24 @@ import GHC.SrcLoc
58import GHC.Stack
76import GHC.Stack
60import Language.Haskell.TH
78import Language.Haskell.TH
61−import qualified Language.Haskell.TH.Syntax as TH
79+import qualified Language.Haskell.TH.Syntax as TH
62import Lens.Micro
80import Lens.Micro
63import Lens.Micro.TH
81import Lens.Micro.TH
64import Network.HostName
82import Network.HostName
65import System.Posix
86import System.Posix
66-------------------------------------------------------------------------------
89-------------------------------------------------------------------------------
69readMay :: Read a => String -> Maybe a
92readMay :: Read a => String -> Maybe a
70readMay s = case [x | (x,t) <- reads s, ("","") <- lex t] of
93readMay s = case [x | (x,t) <- reads s, ("","") <- lex t] of
71 [x] -> Just x
94 [x] -> Just x
72− [] -> Nothing -- no parse
95+ [] -> Nothing -- no parse
73− _ -> Nothing -- Ambiguous parse
96+ _ -> Nothing -- Ambiguous parse
76-------------------------------------------------------------------------------
99-------------------------------------------------------------------------------
@@ -80,7 +103,7 @@ readMay s = case [x | (x,t) <- reads s, ("","") <- lex t] of
80-- IsString/OverloadedStrings, so "foo" will result in Namespace
103-- IsString/OverloadedStrings, so "foo" will result in Namespace
81-- ["foo"].
104-- ["foo"].
82newtype Namespace = Namespace { unNamespace :: [Text] }
105newtype Namespace = Namespace { unNamespace :: [Text] }
83− deriving (Eq,Show,Read,Ord,Generic,ToJSON,FromJSON,Semigroup,Monoid)
106+ deriving (Eq,Show,Read,Ord,Generic,ToJSON,FromJSON,SG.Semigroup,Monoid)
85instance IsString Namespace where
108instance IsString Namespace where
86 fromString s = Namespace [fromString s]
109 fromString s = Namespace [fromString s]
@@ -120,33 +143,35 @@ data Severity
120-- - 'V3' implies the maximum amount of payload information.
143-- - 'V3' implies the maximum amount of payload information.
121-- - Anything in between is left to the discretion of the developer.
144-- - Anything in between is left to the discretion of the developer.
122data Verbosity = V0 | V1 | V2 | V3
145data Verbosity = V0 | V1 | V2 | V3
123− deriving (Eq, Ord, Show, Read, Generic, Enum)
146+ deriving (Eq, Ord, Show, Read, Generic, Enum, Bounded)
126-------------------------------------------------------------------------------
149-------------------------------------------------------------------------------
127renderSeverity :: Severity -> Text
150renderSeverity :: Severity -> Text
128renderSeverity s = case s of
151renderSeverity s = case s of
129− DebugS -> "Debug"
152+ DebugS -> "Debug"
130− InfoS -> "Info"
153+ InfoS -> "Info"
131− NoticeS -> "Notice"
154+ NoticeS -> "Notice"
132− WarningS -> "Warning"
155+ WarningS -> "Warning"
133− ErrorS -> "Error"
156+ ErrorS -> "Error"
134− CriticalS -> "Critical"
157+ CriticalS -> "Critical"
135− AlertS -> "Alert"
158+ AlertS -> "Alert"
136 EmergencyS -> "Emergency"
159 EmergencyS -> "Emergency"
139-------------------------------------------------------------------------------
162-------------------------------------------------------------------------------
140textToSeverity :: Text -> Maybe Severity
163textToSeverity :: Text -> Maybe Severity
141−textToSeverity "Debug" = Just DebugS
164+textToSeverity = go . T.toLower
166+ go "debug" = Just DebugS
142−textToSeverity "Info" = Just InfoS
167+ go "info" = Just InfoS
143−textToSeverity "Notice" = Just NoticeS
168+ go "notice" = Just NoticeS
144−textToSeverity "Warning" = Just WarningS
169+ go "warning" = Just WarningS
145−textToSeverity "Error" = Just ErrorS
170+ go "error" = Just ErrorS
146−textToSeverity "Critical" = Just CriticalS
171+ go "critical" = Just CriticalS
147−textToSeverity "Alert" = Just AlertS
172+ go "alert" = Just AlertS
148−textToSeverity "Emergency" = Just EmergencyS
173+ go "emergency" = Just EmergencyS
149−textToSeverity _ = Nothing
174+ go _ = Nothing
152instance ToJSON Severity where
177instance ToJSON Severity where
@@ -156,14 +181,29 @@ instance FromJSON Severity where
156 parseJSON = A.withText "Severity" parseSeverity
181 parseJSON = A.withText "Severity" parseSeverity
158 parseSeverity t = case textToSeverity t of
183 parseSeverity t = case textToSeverity t of
159− Just x -> return x
184+ Just x -> return x
160 Nothing -> fail $ "Invalid Severity " ++ toS t
185 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
163-------------------------------------------------------------------------------
203-------------------------------------------------------------------------------
164−-- | Log message with Builder unerneath; use '<>' to concat in O(1).
204+-- | Log message with Builder underneath; use '<>' to concat in O(1).
165newtype LogStr = LogStr { unLogStr :: B.Builder }
205newtype LogStr = LogStr { unLogStr :: B.Builder }
166− deriving (Generic, Show)
206+ deriving (Generic, Show, Eq)
168instance IsString LogStr where
208instance IsString LogStr where
169 fromString = LogStr . B.fromString
209 fromString = LogStr . B.fromString
@@ -185,7 +225,7 @@ instance FromJSON LogStr where
186-------------------------------------------------------------------------------
226-------------------------------------------------------------------------------
187-- | Pack any string-like thing into a 'LogStr'. This will
227-- | Pack any string-like thing into a 'LogStr'. This will
188−-- automatically work on 'String', 'ByteString, 'Text' and any of the
228+-- automatically work on 'String', 'ByteString', 'Text' and any of the
189-- lazy variants.
229-- lazy variants.
190logStr :: StringConv a Text => a -> LogStr
230logStr :: StringConv a Text => a -> LogStr
191logStr t = LogStr (B.fromText $ toS t)
231logStr t = LogStr (B.fromText $ toS t)
@@ -198,7 +238,7 @@ ls = logStr
200-------------------------------------------------------------------------------
240-------------------------------------------------------------------------------
201−-- | Convert any showable type into a LogStr.
241+-- | Convert any showable type into a 'LogStr'.
202showLS :: Show a => a -> LogStr
242showLS :: Show a => a -> LogStr
203showLS = ls . show
243showLS = ls . show
@@ -210,7 +250,9 @@ newtype ThreadIdText = ThreadIdText {
212mkThreadIdText :: ThreadId -> ThreadIdText
252mkThreadIdText :: ThreadId -> ThreadIdText
213−mkThreadIdText = ThreadIdText . T.pack . show
253+mkThreadIdText = ThreadIdText . stripPrefix' "ThreadId " . T.pack . show
255+ stripPrefix' pfx t = fromMaybe t (T.stripPrefix pfx t)
216-------------------------------------------------------------------------------
258-------------------------------------------------------------------------------
@@ -230,31 +272,62 @@ data Item a = Item {
230 } deriving (Generic, Functor)
272 } deriving (Generic, Functor)
231makeLenses ''Item
273makeLenses ''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
234instance Show a => Show (Item a) where
299instance Show a => Show (Item a) where
235− show Item{..} = "Item {_itemApp = " ++ show _itemApp ++ ", " ++
300+ showsPrec d Item{..} = showParen (d >= 11) ( showString "Item {"
236− "_itemEnv = " ++ show _itemEnv ++ ", " ++
301+ . field "_itemApp" _itemApp
302+ . field "_itemEnv" _itemEnv
237− "_itemSeverity = " ++ show _itemSeverity ++ ", " ++
303+ . field "_itemSeverity" _itemSeverity
238− "_itemThread = " ++ show _itemThread ++ ", " ++
304+ . field "_itemThread" _itemThread
239− "_itemHost = " ++ show _itemHost ++ ", " ++
305+ . field "_itemHost" _itemHost
240− "_itemProcess = " ++ show _itemProcess ++ ", " ++
306+ . field "_itemProcess" _itemProcess
241− "_itemPayload = " ++ show _itemPayload ++ ", " ++
307+ . field "_itemPayload" _itemPayload
242− "_itemMessage = " ++ show _itemMessage ++ ", " ++
308+ . field "_itemMessage" _itemMessage
243− "_itemTime = " ++ show _itemTime ++ ", " ++
309+ . field "_itemTime" _itemTime
244− "_itemNamespace = " ++ show _itemNamespace ++ ", " ++
310+ . field "_itemNamespace" _itemNamespace
245− "_itemLoc = " ++ show (LocShow <$> _itemLoc) ++ "}"
311+ . showString "_itemLoc = " . shows (LocShow <$> _itemLoc)
315+ field n v = showString n . showString " = " . shows v . showString ", "
248newtype LocShow = LocShow Loc
317newtype LocShow = LocShow Loc
251instance Show LocShow where
320instance Show LocShow where
252− show (LocShow Loc{..}) =
321+ showsPrec d (LocShow Loc{..}) = showParen (d >= 11) ( showString "Loc {"
253− "Loc {loc_filename = " ++ show loc_filename ++ ", " ++
322+ . field "loc_filename" loc_filename
254− "loc_package = " ++ show loc_package ++ ", " ++
323+ . field "loc_package" loc_package
255− "loc_module = " ++ show loc_module ++ ", " ++
324+ . field "loc_module" loc_module
256− "loc_start = " ++ show loc_start ++ ", " ++
325+ . field "loc_start" loc_start
257− "loc_end = " ++ show loc_end ++ "}"
326+ . showString "loc_end = " . shows loc_end
330+ field n v = showString n . showString " = " . shows v . showString ", "
260instance ToJSON a => ToJSON (Item a) where
333instance ToJSON a => ToJSON (Item a) where
@@ -335,7 +408,7 @@ instance FromJSON ProcessIDJs where
335 parseJSON = A.withText "ProcessID" parseProcessID
408 parseJSON = A.withText "ProcessID" parseProcessID
337 parseProcessID t = case textToProcessID t of
410 parseProcessID t = case textToProcessID t of
338− Just p -> return $ ProcessIDJs p
411+ Just p -> return $ ProcessIDJs p
339 Nothing -> fail $ "Invalid ProcessIDJs " ++ toS t
412 Nothing -> fail $ "Invalid ProcessIDJs " ++ toS t
@@ -367,11 +440,12 @@ instance Monoid PayloadSelection where
367-- a ToJSON instance like:
440-- a ToJSON instance like:
369-- > instance ToObject Foo
442-- > instance ToObject Foo
370−class ToJSON a => ToObject a where
443+class ToObject a where
371 toObject :: a -> A.Object
444 toObject :: a -> A.Object
445+ default toObject :: ToJSON a => a -> A.Object
372 toObject v = case toJSON v of
446 toObject v = case toJSON v of
373 A.Object o -> o
447 A.Object o -> o
374− _ -> mempty
448+ _ -> mempty
376instance ToObject ()
450instance ToObject ()
377instance ToObject A.Object
451instance ToObject A.Object
@@ -423,7 +497,7 @@ instance ToObject SimpleLogPayload
424instance LogItem SimpleLogPayload where
498instance LogItem SimpleLogPayload where
425 payloadKeys V0 _ = SomeKeys []
499 payloadKeys V0 _ = SomeKeys []
426− payloadKeys _ _ = AllKeys
500+ payloadKeys _ _ = AllKeys
429instance Semigroup SimpleLogPayload where
503instance Semigroup SimpleLogPayload where
@@ -446,7 +520,7 @@ sl a b = SimpleLogPayload [(a, AnyLogPayload b)]
446-- automatically bubble higher verbosity levels to lower ones.
520-- automatically bubble higher verbosity levels to lower ones.
447payloadObject :: LogItem a => Verbosity -> a -> A.Object
521payloadObject :: LogItem a => Verbosity -> a -> A.Object
448payloadObject verb a = case FT.foldMap (flip payloadKeys a) [(V0)..verb] of
522payloadObject verb a = case FT.foldMap (flip payloadKeys a) [(V0)..verb] of
449− AllKeys -> toObject a
523+ AllKeys -> toObject a
450 SomeKeys ks -> HM.filterWithKey (\ k _ -> k `FT.elem` ks) $ toObject a
524 SomeKeys ks -> HM.filterWithKey (\ k _ -> k `FT.elem` ks) $ toObject a
@@ -466,49 +540,107 @@ itemJson verb a = toJSON $ a & itemPayload %~ payloadObject verb
467-- Scribes should always take a 'Severity' and 'Verbosity'.
541-- Scribes should always take a 'Severity' and 'Verbosity'.
469−-- Severity is used to *exclude log messages* that are < the provided
543+-- Severity is used to __exclude log messages__ that are lower than
470−-- Severity. For instance, if the user passes InfoS, DebugS items
544+-- the provided Severity. For instance, if the user passes InfoS,
471−-- should be ignored. Katip provides the 'permitItem' utility for this.
545+-- DebugS items should be ignored. Katip provides the 'permitItem'
546+-- utility for this. The user or the scribe may use 'permitAND' and
547+-- 'permitOR' to further customize this filtering, even dynamically if
473-- Verbosity is used to select keys from the log item's payload. Each
550-- Verbosity is used to select keys from the log item's payload. Each
474-- 'LogItem' instance describes what keys should be retained for each
551-- 'LogItem' instance describes what keys should be retained for each
475-- Verbosity level. Use the 'payloadObject' utility for extracting the keys
552-- Verbosity level. Use the 'payloadObject' utility for extracting the keys
476−-- that should be permitted.
553+-- that should be written.
478−-- There is no built-in mechanism in katip for telling a scribe that
479−-- its time to shut down. 'unregisterScribe' merely drops it from the
480−-- 'LogEnv'. This means there are 2 ways to handle resources as a scribe:
482−-- 1. Pass in the resource when the scribe is created. Handle
555+-- Scribes provide a finalizer IO action ('scribeFinalizer') that is
483−-- allocation and release of the resource elsewhere. This is what the
556+-- meant to synchronously flush any remaining writes and clean up any
484−-- Handle scribe does.
557+-- resources acquired when the scribe was created. Internally, katip
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
486−-- 2. Return a finalizing function that tells the scribe to shut
565+-- While katip internally buffers messages per 'ScribeSettings', it
487−-- down. @katip-elasticsearch@'s @mkEsScribe@ returns a @IO (Scribe,
566+-- sends them one at a time to the scribe. Depending on the scribe
488−-- IO ())@. The finalizer will flush any queued log messages and shut
567+-- itself, it may make sense for that scribe to keep its own internal
489−-- down gracefully before returning. This can be hooked into your
568+-- buffer to batch-send logs if writing items one at a time is not
490−-- application's shutdown routine to ensure you never miss any log
569+-- efficient. The scribe implementer must be sure that on
491−-- messages on shutdown.
570+-- finalization, all writes are committed synchronously.
492−data Scribe = Scribe {
571+
572+-- | Signature of a function passed to `Scribe` constructor and
573+-- mkScribe* functions that decides which messages to be
574+-- logged. Typically filters based on 'Severity', but can be
575+-- combined with other, custom logic with 'permitAND' and 'permitOR'
493− liPush :: forall a. LogItem a => Item a -> IO ()
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)
588+data Scribe = Scribe {
589+ liPush :: forall a. LogItem a => Item a -> IO ()
590+ -- ^ How do we write an item to the scribe's output?
591+ , scribeFinalizer :: IO ()
592+ -- ^ 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.
595+ , scribePermitItem :: PermitFunc
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
497instance Semigroup Scribe where
612instance Semigroup Scribe where
498− (Scribe a) <> (Scribe b) = Scribe $ \ item -> do
613+ (Scribe pushA finA permitA) <> (Scribe pushB finB permitB) =
499− a item
614+ Scribe (\item -> whenM (permitA item) (pushA item)
500− b item
615+ >> whenM (permitB item) (pushB item)
617+ (finA `finally` finB)
618+ (permitOR permitA permitB)
503instance Monoid Scribe where
621instance Monoid Scribe where
504− mempty = Scribe $ const $ return ()
622+ mempty = Scribe (const (return ())) (return ()) (permitItem DebugS)
505 mappend = (<>)
623 mappend = (<>)
626+-------------------------------------------------------------------------------
627+data ScribeHandle = ScribeHandle {
629+ , shChan :: BQ.TBQueue WorkerMessage
633+-------------------------------------------------------------------------------
634+data WorkerMessage where
635+ NewItem :: LogItem a => Item a -> WorkerMessage
636+ PoisonPill :: WorkerMessage
508-------------------------------------------------------------------------------
639-------------------------------------------------------------------------------
509-- | Should this item be logged given the user's maximum severity?
640-- | Should this item be logged given the user's maximum severity?
641+-- Most new scribes will use this as a base for their 'PermitFunc'
510−permitItem :: Severity -> Item a -> Bool
642+permitItem :: Monad m => Severity -> Item a -> m Bool
511−permitItem sev i = _itemSeverity i >= sev
643+permitItem sev item = return (_itemSeverity item >= sev)
514-------------------------------------------------------------------------------
646-------------------------------------------------------------------------------
@@ -527,16 +659,16 @@ data LogEnv = LogEnv {
527 -- 'AutoUpdate' for high volume logs but note that this may cause
659 -- 'AutoUpdate' for high volume logs but note that this may cause
528 -- some output forms to display logs out of order. Alternatively,
660 -- some output forms to display logs out of order. Alternatively,
529 -- you could just use 'getCurrentTime'.
661 -- you could just use 'getCurrentTime'.
530− , _logEnvScribes :: M.Map Text Scribe
662+ , _logEnvScribes :: M.Map Text ScribeHandle
532makeLenses ''LogEnv
664makeLenses ''LogEnv
535-------------------------------------------------------------------------------
667-------------------------------------------------------------------------------
536−-- | Create a reasonable default InitLogEnv. Uses an 'AutoUdate' with
668+-- | Create a reasonable default InitLogEnv. Uses an 'AutoUpdate' which
537−-- the default settings as the timer. If you are concerned about
669+-- updates the timer every 1ms. If you need even more timestamp
538−-- timestamp precision or event ordering in log outputs like
670+-- precision at the cost of performance, consider setting
539−-- ElasticSearch, you should replace the timer with 'getCurrentTime'
671+-- '_logEnvTimer' with 'getCurrentTime'.
540initLogEnv
672initLogEnv
541 :: Namespace
673 :: Namespace
542 -- ^ A base namespace for this application
674 -- ^ A base namespace for this application
@@ -548,45 +680,123 @@ initLogEnv an env = LogEnv
548 <*> getProcessID
680 <*> getProcessID
549 <*> pure an
681 <*> pure an
550 <*> pure env
682 <*> pure env
551− <*> mkAutoUpdate defaultUpdateSettings { updateAction = getCurrentTime }
683+ <*> mkAutoUpdate defaultUpdateSettings { updateAction = getCurrentTime, updateFreq = 1000 }
552 <*> pure mempty
684 <*> pure mempty
555-------------------------------------------------------------------------------
687-------------------------------------------------------------------------------
556-- | Add a scribe to the list. All future log calls will go to this
688-- | Add a scribe to the list. All future log calls will go to this
557−-- scribe in addition to the others.
689+-- scribe in addition to the others. Writes will be buffered per the
690+-- ScribeSettings to prevent slow scribes from slowing down
691+-- logging. Writes will be dropped if the buffer fills.
558registerScribe
692registerScribe
560 -- ^ Name the scribe
694 -- ^ Name the scribe
561 -> Scribe
695 -> Scribe
562 -> LogEnv
697 -> LogEnv
563− -> LogEnv
698+ -> IO LogEnv
699+registerScribe nm scribe ScribeSettings {..} le = do
700+ queue <- atomically (BQ.newTBQueue (fromIntegral _scribeBufferSize))
701+ worker <- spawnScribeWorker scribe queue
703+ atomically (BQ.writeTBQueue queue PoisonPill)
704+ -- wait for our worker to finish final write
705+ void (Async.waitCatch worker)
706+ -- wait for scribe to finish final write
707+ void (scribeFinalizer scribe)
709+ let sh = ScribeHandle (scribe { scribeFinalizer = fin }) queue
564−registerScribe nm h = logEnvScribes %~ M.insert nm h
710+ return (le & logEnvScribes %~ M.insert nm sh)
713+-------------------------------------------------------------------------------
714+spawnScribeWorker :: Scribe -> BQ.TBQueue WorkerMessage -> IO (Async.Async ())
715+spawnScribeWorker (Scribe write _ _) queue = Async.async go
718+ newCmd <- atomically (BQ.readTBQueue queue)
721+ -- Swallow any direct exceptions from the
722+ -- scribe. safe-exceptions won't catch async exceptions.
723+ void (tryAny (write a))
725+ PoisonPill -> return ()
567-------------------------------------------------------------------------------
728-------------------------------------------------------------------------------
568−-- | Remove a scribe from the list. All future log calls will no
729+data ScribeSettings = ScribeSettings {
569−-- longer use this scribe. If the given scribe doesn't exist, its a no-op.
730+ _scribeBufferSize :: Int
734+makeLenses ''ScribeSettings
737+-- | Reasonable defaults for a scribe. Buffer
739+defaultScribeSettings :: ScribeSettings
740+defaultScribeSettings = ScribeSettings 4096
743+-------------------------------------------------------------------------------
744+-- | Remove a scribe from the environment. This does __not__ finalize
745+-- the scribe. This mainly only makes sense to use with something like
746+-- MonadReader's @local@ function to temporarily disavow a single
747+-- logger for a block of code.
570unregisterScribe
748unregisterScribe
572 -- ^ Name of the scribe
750 -- ^ Name of the scribe
573 -> LogEnv
751 -> LogEnv
574 -> LogEnv
752 -> LogEnv
575−unregisterScribe nm = logEnvScribes %~ M.delete nm
753+unregisterScribe nm = logEnvScribes %~ M.delete nm
578-------------------------------------------------------------------------------
756-------------------------------------------------------------------------------
579−-- | Unregister *all* scribes. Logs will go off into space from this
757+-- | Unregister __all__ scribes. Note that this is __not__ for closing or
580−-- point onward until new scribes are added. Note that you could use
758+-- finalizing scribes, use 'closeScribes' for that. This mainly only
581−-- this with `local` if you're using a Reader based stack to
759+-- makes sense to use with something like MonadReader's @local@
582−-- temporarily disable log output. See `katipNoLogging` for an
760+-- function to temporarily disavow any loggers for a block of code.
584clearScribes
761clearScribes
585 :: LogEnv
762 :: LogEnv
586 -> LogEnv
763 -> LogEnv
587clearScribes = logEnvScribes .~ mempty
764clearScribes = logEnvScribes .~ mempty
767+-------------------------------------------------------------------------------
768+-- | Finalize a scribe. The scribe is removed from the environment,
769+-- its finalizer is called so that it can never be written to again
770+-- and all pending writes are flushed. Note that this will throw any
771+-- exceptions yoru finalizer will throw, and that LogEnv is immutable,
772+-- so it will not be removed in that case.
775+ -- ^ Name of the scribe
778+closeScribe nm le = do
779+ maybe (return ()) (scribeFinalizer . shScribe) (M.lookup nm (_logEnvScribes le))
780+ return (le & logEnvScribes %~ M.delete nm)
783+-------------------------------------------------------------------------------
784+-- | Call this at the end of your program. This is a blocking call
785+-- that stop writing to a scribe's queue, waits for the queue to
786+-- empty, finalizes each scribe in the log environment and then
787+-- removes it. Finalizers are all run even if one of them throws, but
788+-- the exception will be re-thrown at the end.
793+ -- We want to run every finalizer here so we'll not save
794+ -- intermediate logenvs and just clear scribes at the end.
795+ let actions = [void (closeScribe k le) | k <- M.keys (_logEnvScribes le)]
796+ FT.foldr finally (return ()) actions
797+ return (le & logEnvScribes .~ mempty)
590-------------------------------------------------------------------------------
800-------------------------------------------------------------------------------
591-- | Monads where katip logging actions can be performed. Katip is the
801-- | Monads where katip logging actions can be performed. Katip is the
592-- most basic logging monad. You will typically use this directly if
802-- most basic logging monad. You will typically use this directly if
@@ -597,44 +807,86 @@ clearScribes = logEnvScribes .~ mempty
597-- which keeps a namespace and merged context. You can write simple
807-- which keeps a namespace and merged context. You can write simple
598-- functions that add additional namespacing and merges additional
808-- functions that add additional namespacing and merges additional
599-- context on the fly.
809-- 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.
600class MonadIO m => Katip m where
815class MonadIO m => Katip m where
601 getLogEnv :: m LogEnv
816 getLogEnv :: m LogEnv
817+ localLogEnv :: (LogEnv -> LogEnv) -> m a -> m a
604instance Katip m => Katip (ReaderT s m) where
820instance Katip m => Katip (ReaderT s m) where
605 getLogEnv = lift getLogEnv
821 getLogEnv = lift getLogEnv
822+ localLogEnv = mapReaderT . localLogEnv
825+#if !MIN_VERSION_either(4, 5, 0)
608instance Katip m => Katip (EitherT s m) where
826instance Katip m => Katip (EitherT s m) where
609 getLogEnv = lift getLogEnv
827 getLogEnv = lift getLogEnv
828+ localLogEnv = mapEitherT . localLogEnv
611instance Katip m => Katip (ExceptT s m) where
832instance Katip m => Katip (ExceptT s m) where
612 getLogEnv = lift getLogEnv
833 getLogEnv = lift getLogEnv
834+ localLogEnv = mapExceptT . localLogEnv
614instance Katip m => Katip (MaybeT m) where
837instance Katip m => Katip (MaybeT m) where
615 getLogEnv = lift getLogEnv
838 getLogEnv = lift getLogEnv
839+ localLogEnv = mapMaybeT . localLogEnv
618instance Katip m => Katip (StateT s m) where
842instance Katip m => Katip (StateT s m) where
619 getLogEnv = lift getLogEnv
843 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
622instance (Katip m, Monoid s) => Katip (WriterT s m) where
862instance (Katip m, Monoid s) => Katip (WriterT s m) where
623 getLogEnv = lift getLogEnv
863 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
625instance (Katip m) => Katip (ResourceT m) where
872instance (Katip m) => Katip (ResourceT m) where
626 getLogEnv = lift getLogEnv
873 getLogEnv = lift getLogEnv
874+ localLogEnv = transResourceT . localLogEnv
629-------------------------------------------------------------------------------
877-------------------------------------------------------------------------------
630−-- | A concrete monad you can use to run logging actions.
878+-- | A concrete monad you can use to run logging actions. Use this if
879+-- you prefer an explicit monad transformer stack and adding layers as
880+-- opposed to implementing 'Katip' for your monad.
631newtype KatipT m a = KatipT { unKatipT :: ReaderT LogEnv m a }
881newtype KatipT m a = KatipT { unKatipT :: ReaderT LogEnv m a }
632 deriving ( Functor, Applicative, Monad, MonadIO
882 deriving ( Functor, Applicative, Monad, MonadIO
633− , MonadMask, MonadCatch, MonadThrow, MonadTrans, MonadBase b)
883+ , MonadMask, MonadCatch, MonadThrow, MonadResource, MonadTrans
636instance MonadIO m => Katip (KatipT m) where
887instance MonadIO m => Katip (KatipT m) where
637 getLogEnv = KatipT ask
888 getLogEnv = KatipT ask
889+ localLogEnv f (KatipT m) = KatipT $ local f m
640instance MonadTransControl KatipT where
892instance MonadTransControl KatipT where
@@ -650,6 +902,21 @@ instance (MonadBaseControl b m) => MonadBaseControl b (KatipT m) where
650 liftBaseWith = defaultLiftBaseWith
902 liftBaseWith = defaultLiftBaseWith
651 restoreM = defaultRestoreM
903 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)
654-------------------------------------------------------------------------------
921-------------------------------------------------------------------------------
655-- | Execute 'KatipT' on a log env.
922-- | Execute 'KatipT' on a log env.
@@ -657,6 +924,17 @@ runKatipT :: LogEnv -> KatipT m a -> m a
657runKatipT le (KatipT f) = runReaderT f le
924runKatipT 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)
660-------------------------------------------------------------------------------
938-------------------------------------------------------------------------------
661-- | Log with everything, including a source code location. This is
939-- | Log with everything, including a source code location. This is
662-- very low level and you typically can use 'logT' in its place.
940-- very low level and you typically can use 'logT' in its place.
@@ -670,20 +948,43 @@ logItem
671logItem a ns loc sev msg = do
949logItem a ns loc sev msg = do
672 LogEnv{..} <- getLogEnv
950 LogEnv{..} <- getLogEnv
673− liftIO $ do
951+ logKatipItem =<< liftIO
675− <$> pure _logEnvApp
952+ (Item <$> pure _logEnvApp
676− <*> pure _logEnvEnv
953+ <*> pure _logEnvEnv
677− <*> pure sev
954+ <*> pure sev
678− <*> (mkThreadIdText <$> myThreadId)
955+ <*> (mkThreadIdText <$> myThreadId)
679− <*> pure _logEnvHost
956+ <*> pure _logEnvHost
680− <*> pure _logEnvPid
957+ <*> pure _logEnvPid
681− <*> pure a
958+ <*> pure a
682− <*> pure msg
959+ <*> pure msg
683− <*> _logEnvTimer
960+ <*> _logEnvTimer
684− <*> pure (_logEnvApp <> ns)
961+ <*> pure (_logEnvApp <> ns)
685− <*> pure loc
962+ <*> 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
686− FT.forM_ (M.elems _logEnvScribes) $ \ (Scribe h) -> h item
974+ FT.forM_ (M.elems _logEnvScribes) $ \ ScribeHandle {..} -> do
975+ whenM (scribePermitItem shScribe item) $
976+ void $ atomically (tryWriteTBQueue shChan (NewItem item))
978+-------------------------------------------------------------------------------
984+tryWriteTBQueue q a = do
985+ full <- isFullTBQueue q
986+ unless full (writeTBQueue q a)
689-------------------------------------------------------------------------------
990-------------------------------------------------------------------------------
@@ -715,10 +1016,10 @@ logException
715 -> Severity -- ^ Severity
1016 -> Severity -- ^ Severity
716 -> m b -- ^ Main action being run
1017 -> m b -- ^ Main action being run
718−logException a ns sev action = action `catchAll` \e -> f e >> throwM e
1019+logException a ns sev action = action `catchAny` \e -> f e >> throwM e
720 f e = logF a ns sev (msg e)
1021 f e = logF a ns sev (msg e)
721− msg e = ls (T.pack "An exception has occured: ") <> showLS e
1022+ msg e = ls (T.pack "An exception has occurred: ") <> showLS e
724-------------------------------------------------------------------------------
1025-------------------------------------------------------------------------------
@@ -746,14 +1047,14 @@ instance TH.Lift Verbosity where
748instance TH.Lift Severity where
1049instance TH.Lift Severity where
749− lift DebugS = [| DebugS |]
1050+ lift DebugS = [| DebugS |]
750− lift InfoS = [| InfoS |]
1051+ lift InfoS = [| InfoS |]
751− lift NoticeS = [| NoticeS |]
1052+ lift NoticeS = [| NoticeS |]
752− lift WarningS = [| WarningS |]
1053+ lift WarningS = [| WarningS |]
753− lift ErrorS = [| ErrorS |]
1054+ lift ErrorS = [| ErrorS |]
754 lift CriticalS = [| CriticalS |]
1055 lift CriticalS = [| CriticalS |]
755− lift AlertS = [| AlertS |]
1056+ lift AlertS = [| AlertS |]
756− lift EmergencyS = [| EmergencyS |]
1057+ lift EmergencyS = [| EmergencyS |]
759-- | Lift a location into an Exp.
1060-- | Lift a location into an Exp.
@@ -772,11 +1073,15 @@ liftLoc (Loc a b c (d1, d2) (e1, e2)) = [|Loc
772-- fill the 'Maybe Loc' gap in 'logF' of this module, and relies on implicit
1073-- fill the 'Maybe Loc' gap in 'logF' of this module, and relies on implicit
773-- callstacks when available (GHC > 7.8).
1074-- callstacks when available (GHC > 7.8).
774#if MIN_VERSION_base(4, 8, 0)
1075#if MIN_VERSION_base(4, 8, 0)
775−getLoc :: (?loc :: CallStack) => Maybe Loc
1076+getLoc :: HasCallStack => Maybe Loc
776−getLoc = case getCallStack ?loc of
1077+getLoc = case getCallStack callStack of
777 [] -> Nothing
1078 [] -> Nothing
778− xs -> Just . toLoc . last $ xs
1079+ xs -> Just . toLoc . head $ filter filterKatip xs
1081+ filterKatip :: (String, SrcLoc) -> Bool
1082+ filterKatip (_, srcloc) = not $
1083+ "katip-" `isPrefixOf` srcLocPackage srcloc
780 toLoc :: (String, SrcLoc) -> Loc
1085 toLoc :: (String, SrcLoc) -> Loc
781 toLoc (_, l) = Loc {
1086 toLoc (_, l) = Loc {
782 loc_filename = srcLocFile l
1087 loc_filename = srcLocFile l
@@ -807,7 +1112,7 @@ logT = [| \ a ns sev msg -> logItem a ns (Just $(getLocTH)) sev msg |]
809-------------------------------------------------------------------------------
1114-------------------------------------------------------------------------------
810−-- | 'Loc'-tagged logging using implicit-callstacks when available.
1115+-- | 'Loc'-tagged logging using 'GHC.Stack' when available.
812-- This function does not require template-haskell as it
1117-- This function does not require template-haskell as it
813-- automatically uses <https://hackage.haskell.org/package/base-4.8.2.0/docs/GHC-Stack.html#v:getCallStack implicit-callstacks>
1118-- automatically uses <https://hackage.haskell.org/package/base-4.8.2.0/docs/GHC-Stack.html#v:getCallStack implicit-callstacks>
@@ -817,7 +1122,11 @@ logT = [| \ a ns sev msg -> logItem a ns (Just $(getLocTH)) sev msg |]
817-- `logT` for maximum compatibility.
1122-- `logT` for maximum compatibility.
819-- @logLoc obj mempty InfoS "Hello world"@
1124-- @logLoc obj mempty InfoS "Hello world"@
1125+#if MIN_VERSION_base(4, 8, 0)
1126+logLoc :: (Applicative m, LogItem a, Katip m, HasCallStack)
820logLoc :: (Applicative m, LogItem a, Katip m)
1128logLoc :: (Applicative m, LogItem a, Katip m)
822 -> Namespace
1131 -> Namespace
823 -> Severity
1132 -> Severity