summaryrefslogtreecommitdiff
path: root/Logs/Presence/Pure.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-05-10 14:45:55 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-05-10 15:21:35 -0400
commitea506b28110d0e23210fb788b16ffe3deb92f23b (patch)
treee75cd9cbf7e45375f0619a97d2ffb62af3fe31ef /Logs/Presence/Pure.hs
parent0c7caf1e92eda1dde83b9fa95da5fc304ae2767d (diff)
support time-1.5.0
This no longer uses old-locale's defaultTimeLocale, but provides one of its own. Factored out a Logs.TimeStamp.
Diffstat (limited to 'Logs/Presence/Pure.hs')
-rw-r--r--Logs/Presence/Pure.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/Logs/Presence/Pure.hs b/Logs/Presence/Pure.hs
index 88f18435f..ec4415aad 100644
--- a/Logs/Presence/Pure.hs
+++ b/Logs/Presence/Pure.hs
@@ -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