509dad8 · typeable/katip

katip/katip.cabal+1

compare with master

unifiedsplit

@@ -74,6 +74,7 @@ library

74 , mtl >= 2.0 && < 2.3

75 , transformers-base >= 0.3 && < 0.6

76 , resourcet >= 1.1 && < 1.2

77+ , scientific >= 0.3.3.0

77 , microlens >= 0.2.0.0 && < 0.5

78 , microlens >= 0.2.0.0 && < 0.5

78 , microlens-th >= 0.1.0.0 && < 0.5

79 , microlens-th >= 0.1.0.0 && < 0.5

79 , semigroups

80 , semigroups

katip/src/Katip/Scribes/Handle.hs+5−1

@@ -10,6 +10,7 @@ import Control.Monad

10import Data.Aeson

11import qualified Data.HashMap.Strict as HM

12import Data.Monoid

13+import Data.Scientific as S

13import Data.Text (Text)

14import Data.Text (Text)

14import Data.Text.Lazy.Builder

15import Data.Text.Lazy.Builder

15import Data.Text.Lazy.IO as T

16import Data.Text.Lazy.IO as T

@@ -34,10 +35,13 @@ getKeys verb a = concat (renderPair A.<$> HM.toList (payloadObject verb a))

34 case v of

35 case v of

35 Object o -> concat [renderPair (k <> "." <> k', v') | (k', v') <- HM.toList o]

36 Object o -> concat [renderPair (k <> "." <> k', v') | (k', v') <- HM.toList o]

36 String t -> [fromText (k <> ":" <> t)]

37 String t -> [fromText (k <> ":" <> t)]

37− Number n -> [fromText (k <> ":") <> fromString (show n)]

38+ Number n -> [fromText (k <> ":") <> fromString (formatNumber n)]

38 Bool b -> [fromText (k <> ":") <> fromString (show b)]

39 Bool b -> [fromText (k <> ":") <> fromString (show b)]

39 Null -> [fromText (k <> ":null")]

40 Null -> [fromText (k <> ":null")]

40 _ -> mempty -- Can't think of a sensible way to handle arrays

41 _ -> mempty -- Can't think of a sensible way to handle arrays

42+ formatNumber :: Scientific -> String

43+ formatNumber n =

44+ formatScientific Generic (if isFloating n then Nothing else Just 0) n

41

45

42

46

43-------------------------------------------------------------------------------

47-------------------------------------------------------------------------------

katip/test/Katip/Tests/Scribes/Handle-text.golden+2−2

@@ -36,5 +36,5 @@ newline][Info][example][7331][1337][note.deep:some note] message

36[2016-06-12 12:34:56][foo][Info][example][7331][1337][note.deep:some note] message

37[2016-06-12 12:34:56][foo][Info][example][7331][1337][note.deep:some note][main:Some.Module path/Some/Module.hs:30:1] message

38[2016-06-12 12:34:56][foo][Info][example][7331][1337][note.deep:some note][main:Some.Module путь/Some/Module.hs:3000:9000] message

39−[2016-06-12 12:34:56][foo][Info][example][7331][1337][sub:null][text:][num:0.0][float:0.0] message

39+[2016-06-12 12:34:56][foo][Info][example][7331][1337][sub:null][text:][num:0][float:0] message

40−[2016-06-12 12:34:56][foo][Info][example][7331][1337][sub.note.deep:some note][text:note][num:10.0][float:5.5] message

40+[2016-06-12 12:34:56][foo][Info][example][7331][1337][sub.note.deep:some note][text:note][num:10][float:5.5] message