support time-1.5.0

This no longer uses old-locale's defaultTimeLocale, but provides one
of its own.

Factored out a Logs.TimeStamp.
This commit is contained in:
Joey Hess 2015-05-10 14:45:55 -04:00
parent fcb8394e5f
commit 6cf62a9bde
10 changed files with 28 additions and 39 deletions

View file

@ -8,11 +8,10 @@
module Logs.Presence.Pure where
import Data.Time.Clock.POSIX
import Data.Time
import System.Locale
import qualified Data.Map as M
import Common.Annex
import Logs.TimeStamp
import Utility.QuickCheck
data LogLine = LogLine {
@ -29,7 +28,7 @@ parseLog :: String -> [LogLine]
parseLog = mapMaybe parseline . lines
where
parseline l = LogLine
<$> (utcTimeToPOSIXSeconds <$> parseTime defaultTimeLocale "%s%Qs" d)
<$> parsePOSIXTime d
<*> parseStatus s
<*> pure rest
where