git.iko.soy/typeable/katip
on master help sign in
Use time-locale-compat
commit1f179cfd0da1fe744393a0c45a06bfd8cb07ba55 authorMichael Xavier <michael@michaelxavier.net> dateWed 26 Aug 2015, 16:04 (11 years ago) parent9a89ba3
2 files changed+7−5
compare with master
unifiedsplit
katip/katip.cabal+1 katip/src/Katip/Scribes/Handle.hs+6−5
katip/katip.cabal+1
@@ -48,6 +48,7 @@ library
4848 , template-haskell >= 2.8 && < 2.11
4949 , text >= 0.11 && <1.3
5050 , time >= 1 && < 1.6
51+ , time-locale-compat >= 0.1.1.0 && < 0.2
5152 , transformers >= 0.3 && < 0.5
5253 , transformers-compat
5354 , unix >= 2.5 && < 2.8
katip/src/Katip/Scribes/Handle.hs+6−5
@@ -6,14 +6,15 @@ module Katip.Scribes.Handle where
66import Control.Lens
77import Control.Monad
88import Data.Aeson.Lens
9−import qualified Data.HashMap.Strict as HM
9+import qualified Data.HashMap.Strict as HM
1010import Data.Monoid
1111import Data.Text.Lazy.Builder
12−import Data.Text.Lazy.IO as T
12+import Data.Text.Lazy.IO as T
1313import Data.Time
14+import qualified Data.Time.Locale.Compat as LC
1415import System.IO
15−import System.IO.Unsafe (unsafePerformIO)
16−import System.Locale
16+import System.IO.Unsafe (unsafePerformIO)
17+import System.Locale as L
1718-------------------------------------------------------------------------------
1819import Katip.Core
1920-------------------------------------------------------------------------------
@@ -73,7 +74,7 @@ formatItem withColor verb Item{..} =
7374 maybe mempty (brackets . fromString . locationToString) _itemLoc <>
7475 fromText " " <> (unLogStr _itemMessage)
7576 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
7778 ks = map brackets $ getKeys verb _itemPayload
7879 renderSeverity' s = case s of
7980 EmergencyS -> red $ renderSeverity s