git.iko.soy/typeable/katip
on master help sign in
Use time-locale-compat
1f179cfMichael Xavier
katip/katip.cabal+1
compare with master
unifiedsplit
@@ -48,6 +48,7 @@ library
48 , template-haskell >= 2.8 && < 2.11
48 , template-haskell >= 2.8 && < 2.11
49 , text >= 0.11 && <1.3
49 , text >= 0.11 && <1.3
50 , time >= 1 && < 1.6
50 , time >= 1 && < 1.6
51+ , time-locale-compat >= 0.1.1.0 && < 0.2
51 , transformers >= 0.3 && < 0.5
52 , transformers >= 0.3 && < 0.5
52 , transformers-compat
53 , transformers-compat
53 , unix >= 2.5 && < 2.8
54 , unix >= 2.5 && < 2.8
katip/src/Katip/Scribes/Handle.hs+6−5
@@ -6,14 +6,15 @@ module Katip.Scribes.Handle where
6import Control.Lens
6import Control.Lens
7import Control.Monad
7import Control.Monad
8import Data.Aeson.Lens
8import Data.Aeson.Lens
9−import qualified Data.HashMap.Strict as HM
9+import qualified Data.HashMap.Strict as HM
10import Data.Monoid
10import Data.Monoid
11import Data.Text.Lazy.Builder
11import Data.Text.Lazy.Builder
12−import Data.Text.Lazy.IO as T
12+import Data.Text.Lazy.IO as T
13import Data.Time
13import Data.Time
14+import qualified Data.Time.Locale.Compat as LC
14import System.IO
15import System.IO
15−import System.IO.Unsafe (unsafePerformIO)
16+import System.IO.Unsafe (unsafePerformIO)
16−import System.Locale
17+import System.Locale as L
17-------------------------------------------------------------------------------
18-------------------------------------------------------------------------------
18import Katip.Core
19import Katip.Core
19-------------------------------------------------------------------------------
20-------------------------------------------------------------------------------
@@ -73,7 +74,7 @@ formatItem withColor verb Item{..} =
73 maybe mempty (brackets . fromString . locationToString) _itemLoc <>
74 maybe mempty (brackets . fromString . locationToString) _itemLoc <>
74 fromText " " <> (unLogStr _itemMessage)
75 fromText " " <> (unLogStr _itemMessage)
75 where
76 where
76− nowStr = fromString $ formatTime defaultTimeLocale "%Y-%m-%d %H:%M:%S" _itemTime
77+ nowStr = fromString $ formatTime LC.defaultTimeLocale "%Y-%m-%d %H:%M:%S" _itemTime
77 ks = map brackets $ getKeys verb _itemPayload
78 ks = map brackets $ getKeys verb _itemPayload
78 renderSeverity' s = case s of
79 renderSeverity' s = case s of
79 EmergencyS -> red $ renderSeverity s
80 EmergencyS -> red $ renderSeverity s