diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-10 14:45:55 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-10 15:21:35 -0400 |
| commit | ea506b28110d0e23210fb788b16ffe3deb92f23b (patch) | |
| tree | e75cd9cbf7e45375f0619a97d2ffb62af3fe31ef /Logs/UUIDBased.hs | |
| parent | 0c7caf1e92eda1dde83b9fa95da5fc304ae2767d (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/UUIDBased.hs')
| -rw-r--r-- | Logs/UUIDBased.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Logs/UUIDBased.hs b/Logs/UUIDBased.hs index ac876e65f..5613c6fb4 100644 --- a/Logs/UUIDBased.hs +++ b/Logs/UUIDBased.hs @@ -30,12 +30,11 @@ module Logs.UUIDBased ( import qualified Data.Map as M import Data.Time.Clock.POSIX -import Data.Time -import System.Locale import Common import Types.UUID import Logs.MapLog +import Logs.TimeStamp type Log v = MapLog UUID v @@ -73,9 +72,9 @@ parseLogWithUUID parser = M.fromListWith best . mapMaybe parse . lines info | ts == Unknown = drop 1 ws | otherwise = drop 1 $ beginning ws - pdate s = case parseTime defaultTimeLocale "%s%Qs" s of + pdate s = case parsePOSIXTime s of Nothing -> Unknown - Just d -> Date $ utcTimeToPOSIXSeconds d + Just d -> Date d showLogNew :: (v -> String) -> Log v -> String showLogNew = showMapLog fromUUID |