logging-effect-extra-file 1.1.2 → 2.0.0
raw patch · 6 files changed
+43/−28 lines, 6 filesdep +prettyprinterdep −wl-pprint-textdep ~basedep ~logging-effect
Dependencies added: prettyprinter
Dependencies removed: wl-pprint-text
Dependency ranges changed: base, logging-effect
Files
- CHANGELOG.md +6/−0
- executable/log-file-and-severity.hs +2/−2
- executable/log-file.hs +2/−2
- library/Control/Monad/Log/Extra/File.hs +18/−9
- logging-effect-extra-file.cabal +11/−11
- package.yaml +4/−4
CHANGELOG.md view
@@ -1,5 +1,11 @@ # Change log +## 2.0.0++* Include more info in `renderWithFile`+* Bump upper bounds on base to 4.12 and logging-effect to 1.4+* Replace wl-pprint-text with prettyprinter 1.2.*+ ## 1.1.2 * Update haddock example to use `logInfoTH` instead of deprecated `logInformationalTH` splice
executable/log-file-and-severity.hs view
@@ -9,9 +9,9 @@ import Control.Monad.Log.Extra.File (WithFile) import qualified Control.Monad.Log.Extra.File as Log import qualified System.IO as IO-import Text.PrettyPrint.Leijen.Text (Doc)+import Data.Text.Prettyprint.Doc (Doc) -app :: MonadLog (WithSeverity (WithFile Doc)) m => m ()+app :: MonadLog (WithSeverity (WithFile (Doc ann))) m => m () app = do $(Log.logEmergencyTH) "GAH! All systems are down!!!" $(Log.logAlertTH) "Red alert!"
executable/log-file.hs view
@@ -9,9 +9,9 @@ import Control.Monad.Log.Extra.File (WithFile) import qualified Control.Monad.Log.Extra.File as Log import qualified System.IO as IO-import Text.PrettyPrint.Leijen.Text (Doc)+import Data.Text.Prettyprint.Doc (Doc) -app :: MonadLog (WithFile Doc) m => m ()+app :: MonadLog (WithFile (Doc ann)) m => m () app = do $(Log.logMessageTH) "GAH! All systems are down!!!" $(Log.logMessageTH) "Red alert!"
library/Control/Monad/Log/Extra/File.hs view
@@ -50,8 +50,8 @@ import Language.Haskell.TH (Exp, Loc(..), Q) import Language.Haskell.TH.Syntax (Lift(lift)) import qualified Language.Haskell.TH.Syntax as TH-import Text.PrettyPrint.Leijen.Text (Doc)-import qualified Text.PrettyPrint.Leijen.Text as Pretty+import Data.Text.Prettyprint.Doc (Doc)+import qualified Data.Text.Prettyprint.Doc as Pretty -- | Generates a function that logs an 'Emergency' message with info from the -- source file.@@ -134,14 +134,23 @@ -- | Given a way to render the underlying message @a@, render a message with its -- file info. --+-- >>> :set -XOverloadedStrings -- >>> let loc = Loc "SomeFile.hs" "some-package" "SomeModule" (1, 1) (1, 1) -- >>> renderWithFile id (WithFile loc "Some message")--- [SomeModule:1] Some message-renderWithFile :: (a -> Doc) -> (WithFile a -> Doc)-renderWithFile k (WithFile (Loc {loc_module, loc_start}) a) = result where+-- [some-package:SomeModule SomeFile.hs:1:1] Some message+renderWithFile :: (a -> Doc ann) -> (WithFile a -> Doc ann)+renderWithFile k (WithFile loc a) = result where result = Pretty.brackets fileInfo Pretty.<+> rest- fileInfo = Pretty.hcat (Pretty.punctuate Pretty.colon fileInfoList)- fileInfoList = [Pretty.pretty loc_module, Pretty.pretty (fst loc_start)]+ fileInfo = part1 Pretty.<+> part2 where+ part1 = Pretty.hcat . Pretty.punctuate Pretty.colon $+ [ Pretty.pretty . TH.loc_package $ loc+ , Pretty.pretty . TH.loc_module $ loc+ ]+ part2 = Pretty.hcat . Pretty.punctuate Pretty.colon $+ [ Pretty.pretty . TH.loc_filename $ loc+ , Pretty.pretty . fst . TH.loc_start $ loc+ , Pretty.pretty . snd . TH.loc_start $ loc+ ] rest = Pretty.align (k a) -- | Generates a function that logs a message with the given 'Severity' and@@ -180,7 +189,7 @@ {- $quickStartFileInfo @-testAppFileOnly :: 'Log.MonadLog' ('WithFile' 'Pretty.Doc') m => m ()+testAppFileOnly :: 'Log.MonadLog' ('WithFile' ('Doc' ann)) m => m () testAppFileOnly = $('logMessageTH') "Heyo!!!" @ @@ -189,7 +198,7 @@ {- $quickStartFileInfoAndSeverity @-testAppFileAndSeverity :: 'Log.MonadLog' ('WithSeverity' ('WithFile' 'Doc')) m => m ()+testAppFileAndSeverity :: 'Log.MonadLog' ('WithSeverity' ('WithFile' ('Doc' ann))) m => m () testAppFileAndSeverity = do $('logEmergencyTH') "GAH! All systems are down!!!" $('logAlertTH') "Red alert!"
logging-effect-extra-file.cabal view
@@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: e583b40f8a405781d71128d6e10c234395eed3e73032359cda479e0055dc6fd7+-- hash: 0a4a17fc1ee91bf4fdb65516248456825622e374c63ba09e44a2f9c7ec8a66bd name: logging-effect-extra-file-version: 1.1.2+version: 2.0.0 synopsis: TH splices to augment log messages with file info description: TH splices to augment log messages with file info. category: Other@@ -32,10 +32,10 @@ library ghc-options: -Wall build-depends:- base >=4.8 && <4.11- , logging-effect >=1.1.0 && <1.3+ base >=4.8 && <4.12+ , logging-effect >=1.1.0 && <1.4+ , prettyprinter ==1.2.* , template-haskell- , wl-pprint-text >=1.1.0.4 && <1.2 exposed-modules: Control.Monad.Log.Extra.File other-modules:@@ -48,10 +48,10 @@ executable ghc-options: -Wall -rtsopts -threaded -with-rtsopts=-N build-depends:- base >=4.8 && <4.11- , logging-effect >=1.1.0 && <1.3+ base >=4.8 && <4.12+ , logging-effect >=1.1.0 && <1.4 , logging-effect-extra-file- , wl-pprint-text >=1.1.0.4 && <1.2+ , prettyprinter ==1.2.* other-modules: Paths_logging_effect_extra_file default-language: Haskell2010@@ -62,10 +62,10 @@ executable ghc-options: -Wall -rtsopts -threaded -with-rtsopts=-N build-depends:- base >=4.8 && <4.11- , logging-effect >=1.1.0 && <1.3+ base >=4.8 && <4.12+ , logging-effect >=1.1.0 && <1.4 , logging-effect-extra-file- , wl-pprint-text >=1.1.0.4 && <1.2+ , prettyprinter ==1.2.* other-modules: Paths_logging_effect_extra_file default-language: Haskell2010
package.yaml view
@@ -1,9 +1,9 @@ author: Jason Shipman category: Other dependencies:-- base >=4.8 && <4.11-- logging-effect >= 1.1.0 && <1.3-- wl-pprint-text >=1.1.0.4 && <1.2+- base >=4.8 && <4.12+- logging-effect >= 1.1.0 && <1.4+- prettyprinter == 1.2.* description: TH splices to augment log messages with file info. executables: log-file:@@ -39,4 +39,4 @@ maintainer: Jason Shipman name: logging-effect-extra-file synopsis: TH splices to augment log messages with file info-version: '1.1.2'+version: '2.0.0'