@@ -1,11 +1,8 @@
2−{-# LANGUAGE DefaultSignatures #-}
3{-# LANGUAGE DeriveFunctor #-}
1{-# LANGUAGE DeriveFunctor #-}
4{-# LANGUAGE DeriveGeneric #-}
2{-# LANGUAGE DeriveGeneric #-}
5{-# LANGUAGE ExistentialQuantification #-}
3{-# LANGUAGE ExistentialQuantification #-}
6{-# LANGUAGE FlexibleContexts #-}
4{-# LANGUAGE FlexibleContexts #-}
7{-# LANGUAGE FlexibleInstances #-}
5{-# LANGUAGE FlexibleInstances #-}
9{-# LANGUAGE GeneralizedNewtypeDeriving #-}
6{-# LANGUAGE GeneralizedNewtypeDeriving #-}
10{-# LANGUAGE MultiParamTypeClasses #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
11{-# LANGUAGE OverloadedStrings #-}
8{-# LANGUAGE OverloadedStrings #-}
@@ -14,88 +11,47 @@
14{-# LANGUAGE TemplateHaskell #-}
11{-# LANGUAGE TemplateHaskell #-}
15{-# LANGUAGE TypeFamilies #-}
12{-# LANGUAGE TypeFamilies #-}
16{-# LANGUAGE UndecidableInstances #-}
13{-# LANGUAGE UndecidableInstances #-}
17−#if MIN_VERSION_base(4, 9, 0)
18−{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
20−-- | This module is not meant to be imported directly and may contain
21−-- internal mechanisms that will change without notice.
22module Katip.Core where
14module Katip.Core where
24-------------------------------------------------------------------------------
16-------------------------------------------------------------------------------
25−import Control.Applicative as A
17+import Control.Applicative as A
26import Control.AutoUpdate
18import Control.AutoUpdate
27import Control.Concurrent
19import Control.Concurrent
28−import qualified Control.Concurrent.Async as Async
20+import Control.Lens
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)
21+import Control.Monad
33import Control.Monad.Base
22import Control.Monad.Base
34−#if MIN_VERSION_base(4, 9, 0)
35−import qualified Control.Monad.Fail as MF
23+import Control.Monad.Catch
37import Control.Monad.IO.Class
24import Control.Monad.IO.Class
38−import Control.Monad.IO.Unlift
39import Control.Monad.Trans.Class
25import Control.Monad.Trans.Class
40import Control.Monad.Trans.Control
26import Control.Monad.Trans.Control
41−#if !MIN_VERSION_either(4, 5, 0)
42import Control.Monad.Trans.Either
27import Control.Monad.Trans.Either
44−import Control.Monad.Trans.Except
45import Control.Monad.Trans.Maybe
28import Control.Monad.Trans.Maybe
46import Control.Monad.Trans.Reader
29import Control.Monad.Trans.Reader
47−import Control.Monad.Trans.Resource (MonadResource, ResourceT,
30+import Control.Monad.Trans.Resource
49−import Control.Monad.Trans.RWS.Lazy (RWST, mapRWST)
31+import Control.Monad.Trans.State
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)
53−import Control.Monad.Trans.Writer.Lazy (WriterT, mapWriterT)
32+import Control.Monad.Trans.Writer
54−import qualified Control.Monad.Trans.Writer.Strict as Strict (WriterT,
56−import Data.Aeson (FromJSON (..), ToJSON (..),
33+import Data.Aeson (FromJSON (..), ToJSON (..),
58−import qualified Data.Aeson as A
35+import qualified Data.Aeson as A
59−import Data.Foldable as FT
36+import Data.Foldable as FT
60−import qualified Data.HashMap.Strict as HM
37+import qualified Data.HashMap.Strict as HM
61import Data.List
38import Data.List
62−import qualified Data.Map.Strict as M
39+import qualified Data.Map.Strict as M
63−import Data.Maybe (fromMaybe)
40+import Data.Monoid
64−import Data.Semigroup as SG
65import Data.String
41import Data.String
66import Data.String.Conv
42import Data.String.Conv
67−import Data.Text (Text)
43+import Data.Text (Text)
68−import qualified Data.Text as T
44+import qualified Data.Text as T
69−import qualified Data.Text.Lazy.Builder as B
45+import qualified Data.Text.Lazy.Builder as B
70import Data.Time
46import Data.Time
71−import GHC.Generics hiding (to)
47+import GHC.Generics hiding (to)
72−#if MIN_VERSION_base(4, 8, 0)
73−#if !MIN_VERSION_base(4, 9, 0)
78import Language.Haskell.TH
48import Language.Haskell.TH
79−import qualified Language.Haskell.TH.Syntax as TH
49+import qualified Language.Haskell.TH.Syntax as TH
82import Network.HostName
50import Network.HostName
86import System.Posix
51import System.Posix
89-------------------------------------------------------------------------------
52-------------------------------------------------------------------------------
92−readMay :: Read a => String -> Maybe a
93−readMay s = case [x | (x,t) <- reads s, ("","") <- lex t] of
95− [] -> Nothing -- no parse
96− _ -> Nothing -- Ambiguous parse
99-------------------------------------------------------------------------------
55-------------------------------------------------------------------------------
100-- | Represents a heirarchy of namespaces going from general to
56-- | Represents a heirarchy of namespaces going from general to
101-- specific. For instance: ["processname", "subsystem"]. Note that
57-- specific. For instance: ["processname", "subsystem"]. Note that
@@ -103,7 +59,7 @@ readMay s = case [x | (x,t) <- reads s, ("","") <- lex t] of
103-- IsString/OverloadedStrings, so "foo" will result in Namespace
59-- IsString/OverloadedStrings, so "foo" will result in Namespace
104-- ["foo"].
60-- ["foo"].
105newtype Namespace = Namespace { unNamespace :: [Text] }
61newtype Namespace = Namespace { unNamespace :: [Text] }
106− deriving (Eq,Show,Read,Ord,Generic,ToJSON,FromJSON,SG.Semigroup,Monoid)
62+ deriving (Eq,Show,Read,Ord,Generic,ToJSON,FromJSON,Monoid)
108instance IsString Namespace where
64instance IsString Namespace where
109 fromString s = Namespace [fromString s]
65 fromString s = Namespace [fromString s]
@@ -143,81 +99,60 @@ data Severity
143-- - 'V3' implies the maximum amount of payload information.
99-- - 'V3' implies the maximum amount of payload information.
144-- - Anything in between is left to the discretion of the developer.
100-- - Anything in between is left to the discretion of the developer.
145data Verbosity = V0 | V1 | V2 | V3
101data Verbosity = V0 | V1 | V2 | V3
146− deriving (Eq, Ord, Show, Read, Generic, Enum, Bounded)
102+ deriving (Eq, Ord, Show, Read, Generic, Enum)
149-------------------------------------------------------------------------------
105-------------------------------------------------------------------------------
150renderSeverity :: Severity -> Text
106renderSeverity :: Severity -> Text
151renderSeverity s = case s of
107renderSeverity s = case s of
152− DebugS -> "Debug"
108+ DebugS -> "Debug"
153− InfoS -> "Info"
109+ InfoS -> "Info"
154− NoticeS -> "Notice"
110+ NoticeS -> "Notice"
155− WarningS -> "Warning"
111+ WarningS -> "Warning"
156− ErrorS -> "Error"
112+ ErrorS -> "Error"
157− CriticalS -> "Critical"
113+ CriticalS -> "Critical"
158− AlertS -> "Alert"
114+ AlertS -> "Alert"
159 EmergencyS -> "Emergency"
115 EmergencyS -> "Emergency"
162-------------------------------------------------------------------------------
118-------------------------------------------------------------------------------
163−textToSeverity :: Text -> Maybe Severity
119+severityText :: Prism' Text Severity
164−textToSeverity = go . T.toLower
120+severityText = prism renderSeverity toSev
166− go "debug" = Just DebugS
122+ toSev "Debug" = Right DebugS
167− go "info" = Just InfoS
123+ toSev "Info" = Right InfoS
168− go "notice" = Just NoticeS
124+ toSev "Notice" = Right NoticeS
169− go "warning" = Just WarningS
125+ toSev "Warning" = Right WarningS
170− go "error" = Just ErrorS
126+ toSev "Error" = Right ErrorS
171− go "critical" = Just CriticalS
127+ toSev "Critical" = Right CriticalS
172− go "alert" = Just AlertS
128+ toSev "Alert" = Right AlertS
173− go "emergency" = Just EmergencyS
129+ toSev "Emergency" = Right EmergencyS
174− go _ = Nothing
130+ toSev x = Left x
177instance ToJSON Severity where
132instance ToJSON Severity where
178− toJSON s = A.String (renderSeverity s)
133+ toJSON s = A.String (s ^. re severityText)
180instance FromJSON Severity where
136instance FromJSON Severity where
181 parseJSON = A.withText "Severity" parseSeverity
137 parseJSON = A.withText "Severity" parseSeverity
183− parseSeverity t = case textToSeverity t of
139+ parseSeverity t = case t ^? severityText of
184− Just x -> return x
140+ Just x -> return x
185 Nothing -> fail $ "Invalid Severity " ++ toS t
141 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-------------------------------------------------------------------------------
144-------------------------------------------------------------------------------
204−-- | Log message with Builder underneath; use '<>' to concat in O(1).
145+-- | Log message with Builder unerneath; use '<>' to concat in O(1).
205newtype LogStr = LogStr { unLogStr :: B.Builder }
146newtype LogStr = LogStr { unLogStr :: B.Builder }
206− deriving (Generic, Show, Eq)
147+ deriving (Generic, Show)
208instance IsString LogStr where
149instance IsString LogStr where
209 fromString = LogStr . B.fromString
150 fromString = LogStr . B.fromString
212−instance Semigroup LogStr where
213− (LogStr a) <> (LogStr b) = LogStr (a <> b)
216instance Monoid LogStr where
152instance Monoid LogStr where
217− mappend = (<>)
153+ mappend (LogStr a) (LogStr b) = LogStr (a `mappend` b)
218 mempty = LogStr mempty
154 mempty = LogStr mempty
221instance FromJSON LogStr where
156instance FromJSON LogStr where
222 parseJSON = A.withText "LogStr" parseLogStr
157 parseJSON = A.withText "LogStr" parseLogStr
@@ -225,20 +160,20 @@ instance FromJSON LogStr where
226-------------------------------------------------------------------------------
161-------------------------------------------------------------------------------
227-- | Pack any string-like thing into a 'LogStr'. This will
162-- | Pack any string-like thing into a 'LogStr'. This will
228−-- automatically work on 'String', 'ByteString', 'Text' and any of the
163+-- automatically work on 'String', 'ByteString, 'Text' and any of the
229-- lazy variants.
164-- lazy variants.
230logStr :: StringConv a Text => a -> LogStr
165logStr :: StringConv a Text => a -> LogStr
231logStr t = LogStr (B.fromText $ toS t)
166logStr t = LogStr (B.fromText $ toS t)
234-------------------------------------------------------------------------------
169-------------------------------------------------------------------------------
235−-- | Shorthand for 'logStr'
170+-- | Shorthand for 'logMsg'
236ls :: StringConv a Text => a -> LogStr
171ls :: StringConv a Text => a -> LogStr
237ls = logStr
172ls = logStr
240-------------------------------------------------------------------------------
175-------------------------------------------------------------------------------
241−-- | Convert any showable type into a 'LogStr'.
176+-- | Convert any showable type into a LogStr.
242showLS :: Show a => a -> LogStr
177showLS :: Show a => a -> LogStr
243showLS = ls . show
178showLS = ls . show
@@ -250,9 +185,7 @@ newtype ThreadIdText = ThreadIdText {
252mkThreadIdText :: ThreadId -> ThreadIdText
187mkThreadIdText :: ThreadId -> ThreadIdText
253−mkThreadIdText = ThreadIdText . stripPrefix' "ThreadId " . T.pack . show
188+mkThreadIdText = ThreadIdText . T.pack . show
255− stripPrefix' pfx t = fromMaybe t (T.stripPrefix pfx t)
258-------------------------------------------------------------------------------
191-------------------------------------------------------------------------------
@@ -272,62 +205,31 @@ data Item a = Item {
272 } deriving (Generic, Functor)
205 } deriving (Generic, Functor)
273makeLenses ''Item
206makeLenses ''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
209instance Show a => Show (Item a) where
300− showsPrec d Item{..} = showParen (d >= 11) ( showString "Item {"
210+ show Item{..} = "Item {_itemApp = " ++ show _itemApp ++ ", " ++
301− . field "_itemApp" _itemApp
211+ "_itemEnv = " ++ show _itemEnv ++ ", " ++
302− . field "_itemEnv" _itemEnv
303− . field "_itemSeverity" _itemSeverity
212+ "_itemSeverity = " ++ show _itemSeverity ++ ", " ++
304− . field "_itemThread" _itemThread
213+ "_itemThread = " ++ show _itemThread ++ ", " ++
305− . field "_itemHost" _itemHost
214+ "_itemHost = " ++ show _itemHost ++ ", " ++
306− . field "_itemProcess" _itemProcess
215+ "_itemProcess = " ++ show _itemProcess ++ ", " ++
307− . field "_itemPayload" _itemPayload
216+ "_itemPayload = " ++ show _itemPayload ++ ", " ++
308− . field "_itemMessage" _itemMessage
217+ "_itemMessage = " ++ show _itemMessage ++ ", " ++
309− . field "_itemTime" _itemTime
218+ "_itemTime = " ++ show _itemTime ++ ", " ++
310− . field "_itemNamespace" _itemNamespace
219+ "_itemNamespace = " ++ show _itemNamespace ++ ", " ++
311− . showString "_itemLoc = " . shows (LocShow <$> _itemLoc)
220+ "_itemLoc = " ++ show (LocShow <$> _itemLoc) ++ "}"
315− field n v = showString n . showString " = " . shows v . showString ", "
317newtype LocShow = LocShow Loc
223newtype LocShow = LocShow Loc
320instance Show LocShow where
226instance Show LocShow where
321− showsPrec d (LocShow Loc{..}) = showParen (d >= 11) ( showString "Loc {"
227+ show (LocShow Loc{..}) =
322− . field "loc_filename" loc_filename
228+ "Loc {loc_filename = " ++ show loc_filename ++ ", " ++
323− . field "loc_package" loc_package
229+ "loc_package = " ++ show loc_package ++ ", " ++
324− . field "loc_module" loc_module
230+ "loc_module = " ++ show loc_module ++ ", " ++
325− . field "loc_start" loc_start
231+ "loc_start = " ++ show loc_start ++ ", " ++
326− . showString "loc_end = " . shows loc_end
232+ "loc_end = " ++ show loc_end ++ "}"
330− field n v = showString n . showString " = " . shows v . showString ", "
333instance ToJSON a => ToJSON (Item a) where
235instance ToJSON a => ToJSON (Item a) where
@@ -387,12 +289,13 @@ instance FromJSON a => FromJSON (Item a) where
387 <*> (fmap getLocJs <$> o A..: "loc")
289 <*> (fmap getLocJs <$> o A..: "loc")
390−processIDToText :: ProcessID -> Text
292+processIDText :: Prism' Text ProcessID
391−processIDToText = toS . show
293+processIDText = prism fromProcessID toProcessID
393−
295+ fromProcessID = toS . show
394−textToProcessID :: Text -> Maybe ProcessID
296+ toProcessID t = case toS t ^? _Show of
395−textToProcessID = readMay . toS
297+ Just i -> Right i
398newtype ProcessIDJs = ProcessIDJs {
301newtype ProcessIDJs = ProcessIDJs {
@@ -401,14 +304,14 @@ newtype ProcessIDJs = ProcessIDJs {
403instance ToJSON ProcessIDJs where
306instance ToJSON ProcessIDJs where
404− toJSON (ProcessIDJs p) = A.String (processIDToText p)
307+ toJSON (ProcessIDJs p) = A.String (p ^. re processIDText)
407instance FromJSON ProcessIDJs where
310instance FromJSON ProcessIDJs where
408 parseJSON = A.withText "ProcessID" parseProcessID
311 parseJSON = A.withText "ProcessID" parseProcessID
410− parseProcessID t = case textToProcessID t of
313+ parseProcessID t = case t ^? processIDText of
411− Just p -> return $ ProcessIDJs p
314+ Just p -> return $ ProcessIDJs p
412 Nothing -> fail $ "Invalid ProcessIDJs " ++ toS t
315 Nothing -> fail $ "Invalid ProcessIDJs " ++ toS t
@@ -417,17 +320,12 @@ instance FromJSON ProcessIDJs where
417data PayloadSelection
320data PayloadSelection
418 = AllKeys
321 = AllKeys
419 | SomeKeys [Text]
322 | SomeKeys [Text]
422−instance Semigroup PayloadSelection where
423− AllKeys <> _ = AllKeys
424− _ <> AllKeys = AllKeys
425− SomeKeys as <> SomeKeys bs = SomeKeys (as <> bs)
428instance Monoid PayloadSelection where
324instance Monoid PayloadSelection where
429 mempty = SomeKeys []
325 mempty = SomeKeys []
430− mappend = (<>)
326+ mappend AllKeys _ = AllKeys
327+ mappend _ AllKeys = AllKeys
328+ mappend (SomeKeys as) (SomeKeys bs) = SomeKeys (as++bs)
433-------------------------------------------------------------------------------
331-------------------------------------------------------------------------------
@@ -440,12 +338,11 @@ instance Monoid PayloadSelection where
440-- a ToJSON instance like:
338-- a ToJSON instance like:
442-- > instance ToObject Foo
340-- > instance ToObject Foo
443−class ToObject a where
341+class ToJSON a => ToObject a where
444 toObject :: a -> A.Object
342 toObject :: a -> A.Object
445− default toObject :: ToJSON a => a -> A.Object
446 toObject v = case toJSON v of
343 toObject v = case toJSON v of
447 A.Object o -> o
344 A.Object o -> o
448− _ -> mempty
345+ _ -> mempty
450instance ToObject ()
347instance ToObject ()
451instance ToObject A.Object
348instance ToObject A.Object
@@ -491,22 +388,15 @@ instance ToJSON SimpleLogPayload where
491 toJSON (SimpleLogPayload as) = object $ map go as
388 toJSON (SimpleLogPayload as) = object $ map go as
492 where go (k, AnyLogPayload v) = k A..= v
389 where go (k, AnyLogPayload v) = k A..= v
495instance ToObject SimpleLogPayload
391instance ToObject SimpleLogPayload
498instance LogItem SimpleLogPayload where
393instance LogItem SimpleLogPayload where
499 payloadKeys V0 _ = SomeKeys []
394 payloadKeys V0 _ = SomeKeys []
500− payloadKeys _ _ = AllKeys
395+ payloadKeys _ _ = AllKeys
503−instance Semigroup SimpleLogPayload where
504− SimpleLogPayload a <> SimpleLogPayload b = SimpleLogPayload (a <> b)
507instance Monoid SimpleLogPayload where
397instance Monoid SimpleLogPayload where
508 mempty = SimpleLogPayload []
398 mempty = SimpleLogPayload []
509− mappend = (<>)
399+ SimpleLogPayload a `mappend` SimpleLogPayload b = SimpleLogPayload (a `mappend` b)
512-------------------------------------------------------------------------------
402-------------------------------------------------------------------------------
@@ -520,8 +410,8 @@ sl a b = SimpleLogPayload [(a, AnyLogPayload b)]
520-- automatically bubble higher verbosity levels to lower ones.
410-- automatically bubble higher verbosity levels to lower ones.
521payloadObject :: LogItem a => Verbosity -> a -> A.Object
411payloadObject :: LogItem a => Verbosity -> a -> A.Object
522payloadObject verb a = case FT.foldMap (flip payloadKeys a) [(V0)..verb] of
412payloadObject verb a = case FT.foldMap (flip payloadKeys a) [(V0)..verb] of
523− AllKeys -> toObject a
413+ AllKeys -> toObject a
524− SomeKeys ks -> HM.filterWithKey (\ k _ -> k `FT.elem` ks) $ toObject a
414+ SomeKeys ks -> HM.filterWithKey (\ k _ -> k `elem` ks) $ toObject a
527-------------------------------------------------------------------------------
417-------------------------------------------------------------------------------
@@ -540,135 +430,67 @@ itemJson verb a = toJSON $ a & itemPayload %~ payloadObject verb
541-- Scribes should always take a 'Severity' and 'Verbosity'.
431-- Scribes should always take a 'Severity' and 'Verbosity'.
543−-- Severity is used to __exclude log messages__ that are lower than
433+-- Severity is used to *exclude log messages* that are < the provided
544−-- the provided Severity. For instance, if the user passes InfoS,
434+-- Severity. For instance, if the user passes InfoS, DebugS items
545−-- DebugS items should be ignored. Katip provides the 'permitItem'
435+-- 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
437-- Verbosity is used to select keys from the log item's payload. Each
551-- 'LogItem' instance describes what keys should be retained for each
438-- 'LogItem' instance describes what keys should be retained for each
552-- Verbosity level. Use the 'payloadObject' utility for extracting the keys
439-- Verbosity level. Use the 'payloadObject' utility for extracting the keys
553−-- that should be written.
440+-- that should be permitted.
555−-- Scribes provide a finalizer IO action ('scribeFinalizer') that is
442+-- 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
443+-- its time to shut down. 'unregisterScribe' merely drops it from the
557−-- resources acquired when the scribe was created. Internally, katip
444+-- '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
446+-- 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
447+-- 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
448+-- Handle scribe does.
568−-- buffer to batch-send logs if writing items one at a time is not
449+--
569−-- efficient. The scribe implementer must be sure that on
450+-- 2. Return a finalizing function that tells the scribe to shut
570−-- finalization, all writes are committed synchronously.
451+-- down. @katip-elasticsearch@'s @mkEsScribe@ returns a @IO (Scribe,
571−
452+-- IO ())@. The finalizer will flush any queued log messages and shut
572−-- | Signature of a function passed to `Scribe` constructor and
453+-- down gracefully before returning. This can be hooked into your
573−-- mkScribe* functions that decides which messages to be
454+-- application's shutdown routine to ensure you never miss any log
574−-- logged. Typically filters based on 'Severity', but can be
455+-- 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 {
456data Scribe = Scribe {
589− liPush :: forall a. LogItem a => Item a -> IO ()
457+ 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
612−instance Semigroup Scribe where
613− (Scribe pushA finA permitA) <> (Scribe pushB finB permitB) =
614− Scribe (\item -> whenM (permitA item) (pushA item)
615− >> whenM (permitB item) (pushB item)
617− (finA `finally` finB)
618− (permitOR permitA permitB)
621−instance Monoid Scribe where
622− mempty = Scribe (const (return ())) (return ()) (permitItem DebugS)
626−-------------------------------------------------------------------------------
627−data ScribeHandle = ScribeHandle {
629− , shChan :: BQ.TBQueue WorkerMessage
633−-------------------------------------------------------------------------------
461+instance Monoid Scribe where
634−data WorkerMessage where
462+ mempty = Scribe $ const $ return ()
635− NewItem :: LogItem a => Item a -> WorkerMessage
463+ mappend (Scribe a) (Scribe b) = Scribe $ \ item -> do
636− PoisonPill :: WorkerMessage
464+ a item
639-------------------------------------------------------------------------------
468-------------------------------------------------------------------------------
640-- | Should this item be logged given the user's maximum severity?
469-- | 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
470+permitItem :: Severity -> Item a -> Bool
643−permitItem sev item = return (_itemSeverity item >= sev)
471+permitItem sev i = _itemSeverity i >= sev
646-------------------------------------------------------------------------------
474-------------------------------------------------------------------------------
647data LogEnv = LogEnv {
475data LogEnv = LogEnv {
648 _logEnvHost :: HostName
476 _logEnvHost :: HostName
649 , _logEnvPid :: ProcessID
477 , _logEnvPid :: ProcessID
650− , _logEnvApp :: Namespace
478+ , _logEnvNs :: Namespace
651− -- ^ Name of application. This will typically never change. This
652− -- field gets prepended to the namespace of your individual log
653− -- messages. For example, if your app is MyApp and you write a log
654− -- using "logItem" and the namespace "WebServer", the final
655− -- namespace will be "MyApp.WebServer"
656 , _logEnvEnv :: Environment
479 , _logEnvEnv :: Environment
657 , _logEnvTimer :: IO UTCTime
480 , _logEnvTimer :: IO UTCTime
658 -- ^ Action to fetch the timestamp. You can use something like
481 -- ^ Action to fetch the timestamp. You can use something like
659 -- 'AutoUpdate' for high volume logs but note that this may cause
482 -- 'AutoUpdate' for high volume logs but note that this may cause
660− -- some output forms to display logs out of order. Alternatively,
483+ -- some output forms to display logs out of order.
661− -- you could just use 'getCurrentTime'.
662− , _logEnvScribes :: M.Map Text ScribeHandle
484+ , _logEnvScribes :: M.Map Text Scribe
664makeLenses ''LogEnv
486makeLenses ''LogEnv
667-------------------------------------------------------------------------------
489-------------------------------------------------------------------------------
668−-- | Create a reasonable default InitLogEnv. Uses an 'AutoUpdate' which
490+-- | Create a reasonable default InitLogEnv. Uses an 'AutoUdate' with
669−-- updates the timer every 1ms. If you need even more timestamp
491+-- the default settings as the timer. If you are concerned about
670−-- precision at the cost of performance, consider setting
492+-- timestamp precision or event ordering in log outputs like
671−-- '_logEnvTimer' with 'getCurrentTime'.
493+-- ElasticSearch, you should replace the timer with 'getCurrentTime'
672initLogEnv
494initLogEnv
673 :: Namespace
495 :: Namespace
674 -- ^ A base namespace for this application
496 -- ^ A base namespace for this application
@@ -680,84 +502,36 @@ initLogEnv an env = LogEnv
680 <*> getProcessID
502 <*> getProcessID
681 <*> pure an
503 <*> pure an
682 <*> pure env
504 <*> pure env
683− <*> mkAutoUpdate defaultUpdateSettings { updateAction = getCurrentTime, updateFreq = 1000 }
505+ <*> mkAutoUpdate defaultUpdateSettings { updateAction = getCurrentTime }
684 <*> pure mempty
506 <*> pure mempty
687-------------------------------------------------------------------------------
509-------------------------------------------------------------------------------
688-- | Add a scribe to the list. All future log calls will go to this
510-- | 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
511+-- 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
512registerScribe
694 -- ^ Name the scribe
514 -- ^ Name the scribe
695 -> Scribe
515 -> Scribe
697 -> LogEnv
516 -> LogEnv
698− -> IO LogEnv
517+ -> LogEnv
699−registerScribe nm scribe ScribeSettings {..} le = do
518+registerScribe nm h = logEnvScribes . at nm .~ Just h
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
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 ()
728−-------------------------------------------------------------------------------
729−data ScribeSettings = ScribeSettings {
730− _scribeBufferSize :: Int
734−makeLenses ''ScribeSettings
737−-- | Reasonable defaults for a scribe. Buffer
739−defaultScribeSettings :: ScribeSettings
740−defaultScribeSettings = ScribeSettings 4096
743-------------------------------------------------------------------------------
521-------------------------------------------------------------------------------
744−-- | Remove a scribe from the environment. This does __not__ finalize
522+-- | Remove a scribe from the list. All future log calls will no
745−-- the scribe. This mainly only makes sense to use with something like
523+-- longer use this scribe. If the given scribe doesn't exist, its a no-op.
746−-- MonadReader's @local@ function to temporarily disavow a single
747−-- logger for a block of code.
748unregisterScribe
524unregisterScribe
750 -- ^ Name of the scribe
526 -- ^ Name of the scribe
751 -> LogEnv
527 -> LogEnv
752 -> LogEnv
528 -> LogEnv
753−unregisterScribe nm = logEnvScribes %~ M.delete nm
529+unregisterScribe nm = logEnvScribes . at nm .~ Nothing
756-------------------------------------------------------------------------------
532-------------------------------------------------------------------------------
757−-- | Unregister __all__ scribes. Note that this is __not__ for closing or
533+-- | Unregister *all* scribes. Logs will go off into space from this
758−-- finalizing scribes, use 'closeScribes' for that. This mainly only
534+-- point onward until new scribes are added.
759−-- makes sense to use with something like MonadReader's @local@
760−-- function to temporarily disavow any loggers for a block of code.
761clearScribes
535clearScribes
762 :: LogEnv
536 :: LogEnv
763 -> LogEnv
537 -> LogEnv
@@ -765,128 +539,43 @@ clearScribes = logEnvScribes .~ mempty
767-------------------------------------------------------------------------------
541-------------------------------------------------------------------------------
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)
800−-------------------------------------------------------------------------------
801−-- | Monads where katip logging actions can be performed. Katip is the
542+-- | Monads where katip logging actions can be performed
802−-- most basic logging monad. You will typically use this directly if
803−-- you either don't want to use namespaces/contexts heavily or if you
804−-- want to pass in specific contexts and/or namespaces at each log site.
806−-- For something more powerful, look at the docs for 'KatipContext',
807−-- which keeps a namespace and merged context. You can write simple
808−-- functions that add additional namespacing and merges additional
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.
815−class MonadIO m => Katip m where
543+class MonadIO m => Katip m where
816 getLogEnv :: m LogEnv
544 getLogEnv :: m LogEnv
817− localLogEnv :: (LogEnv -> LogEnv) -> m a -> m a
820instance Katip m => Katip (ReaderT s m) where
547instance Katip m => Katip (ReaderT s m) where
821 getLogEnv = lift getLogEnv
548 getLogEnv = lift getLogEnv
822− localLogEnv = mapReaderT . localLogEnv
825−#if !MIN_VERSION_either(4, 5, 0)
826instance Katip m => Katip (EitherT s m) where
551instance Katip m => Katip (EitherT s m) where
827 getLogEnv = lift getLogEnv
552 getLogEnv = lift getLogEnv
828− localLogEnv = mapEitherT . localLogEnv
832−instance Katip m => Katip (ExceptT s m) where
833− getLogEnv = lift getLogEnv
834− localLogEnv = mapExceptT . localLogEnv
837instance Katip m => Katip (MaybeT m) where
555instance Katip m => Katip (MaybeT m) where
838 getLogEnv = lift getLogEnv
556 getLogEnv = lift getLogEnv
839− localLogEnv = mapMaybeT . localLogEnv
842instance Katip m => Katip (StateT s m) where
559instance Katip m => Katip (StateT s m) where
843 getLogEnv = lift getLogEnv
560 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
563instance (Katip m, Monoid s) => Katip (WriterT s m) where
863 getLogEnv = lift getLogEnv
564 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
566instance (Katip m) => Katip (ResourceT m) where
873 getLogEnv = lift getLogEnv
567 getLogEnv = lift getLogEnv
874− localLogEnv = transResourceT . localLogEnv
877-------------------------------------------------------------------------------
570-------------------------------------------------------------------------------
878−-- | A concrete monad you can use to run logging actions. Use this if
571+-- | 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 }
572newtype KatipT m a = KatipT { unKatipT :: ReaderT LogEnv m a }
882 deriving ( Functor, Applicative, Monad, MonadIO
573 deriving ( Functor, Applicative, Monad, MonadIO
883− , MonadMask, MonadCatch, MonadThrow, MonadResource, MonadTrans
574+ , MonadMask, MonadCatch, MonadThrow, MonadTrans, MonadBase b)
887instance MonadIO m => Katip (KatipT m) where
577instance MonadIO m => Katip (KatipT m) where
888 getLogEnv = KatipT ask
578 getLogEnv = KatipT ask
889− localLogEnv f (KatipT m) = KatipT $ local f m
892instance MonadTransControl KatipT where
581instance MonadTransControl KatipT where
@@ -902,21 +591,6 @@ instance (MonadBaseControl b m) => MonadBaseControl b (KatipT m) where
902 liftBaseWith = defaultLiftBaseWith
591 liftBaseWith = defaultLiftBaseWith
903 restoreM = defaultRestoreM
592 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-------------------------------------------------------------------------------
595-------------------------------------------------------------------------------
922-- | Execute 'KatipT' on a log env.
596-- | Execute 'KatipT' on a log env.
@@ -924,17 +598,6 @@ runKatipT :: LogEnv -> KatipT m a -> m a
924runKatipT le (KatipT f) = runReaderT f le
598runKatipT 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-------------------------------------------------------------------------------
601-------------------------------------------------------------------------------
939-- | Log with everything, including a source code location. This is
602-- | Log with everything, including a source code location. This is
940-- very low level and you typically can use 'logT' in its place.
603-- very low level and you typically can use 'logT' in its place.
@@ -948,43 +611,20 @@ logItem
949logItem a ns loc sev msg = do
612logItem a ns loc sev msg = do
950 LogEnv{..} <- getLogEnv
613 LogEnv{..} <- getLogEnv
951− logKatipItem =<< liftIO
614+ liftIO $ do
952− (Item <$> pure _logEnvApp
615+ item <- Item
953− <*> pure _logEnvEnv
617+ <*> pure _logEnvEnv
954− <*> pure sev
618+ <*> pure sev
955− <*> (mkThreadIdText <$> myThreadId)
619+ <*> (mkThreadIdText <$> myThreadId)
956− <*> pure _logEnvHost
620+ <*> pure _logEnvHost
957− <*> pure _logEnvPid
621+ <*> pure _logEnvPid
958− <*> pure a
622+ <*> pure a
959− <*> pure msg
623+ <*> pure msg
960− <*> _logEnvTimer
624+ <*> _logEnvTimer
961− <*> pure (_logEnvApp <> ns)
625+ <*> pure (_logEnvNs <> ns)
962− <*> pure loc)
626+ <*> 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
627+ forM_ (M.elems _logEnvScribes) $ \ (Scribe h) -> h item
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)
990-------------------------------------------------------------------------------
630-------------------------------------------------------------------------------
@@ -1016,10 +656,10 @@ logException
1016 -> Severity -- ^ Severity
656 -> Severity -- ^ Severity
1017 -> m b -- ^ Main action being run
657 -> m b -- ^ Main action being run
1019−logException a ns sev action = action `catchAny` \e -> f e >> throwM e
659+logException a ns sev action = action `catchAll` \e -> f e >> throwM e
1021 f e = logF a ns sev (msg e)
661 f e = logF a ns sev (msg e)
1022− msg e = ls (T.pack "An exception has occurred: ") <> showLS e
662+ msg e = ls (T.pack "An exception has occured: ") <> showLS e
1025-------------------------------------------------------------------------------
665-------------------------------------------------------------------------------
@@ -1047,14 +687,14 @@ instance TH.Lift Verbosity where
1049instance TH.Lift Severity where
689instance TH.Lift Severity where
1050− lift DebugS = [| DebugS |]
690+ lift DebugS = [| DebugS |]
1051− lift InfoS = [| InfoS |]
691+ lift InfoS = [| InfoS |]
1052− lift NoticeS = [| NoticeS |]
692+ lift NoticeS = [| NoticeS |]
1053− lift WarningS = [| WarningS |]
693+ lift WarningS = [| WarningS |]
1054− lift ErrorS = [| ErrorS |]
694+ lift ErrorS = [| ErrorS |]
1055 lift CriticalS = [| CriticalS |]
695 lift CriticalS = [| CriticalS |]
1056− lift AlertS = [| AlertS |]
696+ lift AlertS = [| AlertS |]
1057− lift EmergencyS = [| EmergencyS |]
697+ lift EmergencyS = [| EmergencyS |]
1060-- | Lift a location into an Exp.
700-- | Lift a location into an Exp.
@@ -1070,37 +710,9 @@ liftLoc (Loc a b c (d1, d2) (e1, e2)) = [|Loc
1071-------------------------------------------------------------------------------
711-------------------------------------------------------------------------------
1072-- | For use when you want to include location in your logs. This will
712-- | For use when you want to include location in your logs. This will
1073−-- fill the 'Maybe Loc' gap in 'logF' of this module, and relies on implicit
713+-- fill the 'Maybe Loc' gap in 'logF' of this module.
1074−-- callstacks when available (GHC > 7.8).
714+getLoc :: Q Exp
1075−#if MIN_VERSION_base(4, 8, 0)
1076−getLoc :: HasCallStack => Maybe Loc
1077−getLoc = case getCallStack callStack of
1079− xs -> Just . toLoc . head $ filter filterKatip xs
1081− filterKatip :: (String, SrcLoc) -> Bool
1082− filterKatip (_, srcloc) = not $
1083− "katip-" `isPrefixOf` srcLocPackage srcloc
1085− toLoc :: (String, SrcLoc) -> Loc
1086− toLoc (_, l) = Loc {
1087− loc_filename = srcLocFile l
1088− , loc_package = srcLocPackage l
1089− , loc_module = srcLocModule l
1090− , loc_start = (srcLocStartLine l, srcLocStartCol l)
1091− , loc_end = (srcLocEndLine l, srcLocEndCol l)
1099−-------------------------------------------------------------------------------
1100−-- Like `getLoc`, but uses template-haskell and works with older versions of
1101−-- the compiler (GHC 7.8 or older).
1103−getLocTH = [| $(location >>= liftLoc) |]
715+getLoc = [| $(location >>= liftLoc) |]
1106-------------------------------------------------------------------------------
718-------------------------------------------------------------------------------
@@ -1108,31 +720,7 @@ getLocTH = [| $(location >>= liftLoc) |]
1109-- @$(logT) obj mempty InfoS "Hello world"@
721-- @$(logT) obj mempty InfoS "Hello world"@
1110logT :: ExpQ
722logT :: ExpQ
1111−logT = [| \ a ns sev msg -> logItem a ns (Just $(getLocTH)) sev msg |]
723+logT = [| \ a ns sev msg -> logItem a ns (Just $(getLoc)) sev msg |]
1114−-------------------------------------------------------------------------------
1115−-- | 'Loc'-tagged logging using 'GHC.Stack' when available.
1117−-- 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>
1119−-- when the code is compiled using GHC > 7.8. Using an older version of the
1120−-- compiler will result in the emission of a log line without any location information,
1121−-- so be aware of it. Users using GHC <= 7.8 may want to use the template-haskell function
1122−-- `logT` for maximum compatibility.
1124−-- @logLoc obj mempty InfoS "Hello world"@
1125−#if MIN_VERSION_base(4, 8, 0)
1126−logLoc :: (Applicative m, LogItem a, Katip m, HasCallStack)
1128−logLoc :: (Applicative m, LogItem a, Katip m)
1135−logLoc a ns = logItem a ns getLoc
1138-- taken from the file-location package
726-- taken from the file-location package