From 455e1d9e779c1c333d619f1634497380234a1b18 Mon Sep 17 00:00:00 2001 From: Keagan McClelland Date: Tue, 23 Nov 2021 17:24:54 -0700 Subject: [PATCH] changes log epoch to use text instead of word64 due to overflow issues (#81) --- src/Handler/ErrorLogs.hs | 11 ++--------- src/Model.hs | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/Handler/ErrorLogs.hs b/src/Handler/ErrorLogs.hs index b16d8eb..56ff126 100644 --- a/src/Handler/ErrorLogs.hs +++ b/src/Handler/ErrorLogs.hs @@ -2,11 +2,9 @@ {-# LANGUAGE TypeApplications #-} module Handler.ErrorLogs where -import Control.Monad ( MonadFail(fail) ) import Data.Aeson ( (.:) , FromJSON(parseJSON) , withObject - , withText ) import Foundation import Model ( EntityField(ErrorLogRecordIncidents) @@ -20,7 +18,7 @@ import Yesod.Persist ( (+=.) ) data ErrorLog = ErrorLog - { errorLogEpoch :: Word64 + { errorLogEpoch :: Text , errorLogCommitHash :: Text , errorLogSourceFile :: Text , errorLogLine :: Word32 @@ -32,12 +30,7 @@ data ErrorLog = ErrorLog instance FromJSON ErrorLog where parseJSON = withObject "Error Log" $ \o -> do - errorLogEpoch <- o .: "log-epoch" >>= withText - "Word64" - (\t -> case readMaybe t of - Nothing -> fail "Invalid Log Epoch" - Just x -> pure x - ) + errorLogEpoch <- o .: "log-epoch" errorLogCommitHash <- o .: "commit-hash" errorLogSourceFile <- o .: "file" errorLogLine <- o .: "line" diff --git a/src/Model.hs b/src/Model.hs index d65f088..9f374b7 100644 --- a/src/Model.hs +++ b/src/Model.hs @@ -82,7 +82,7 @@ EosHash ErrorLogRecord createdAt UTCTime - epoch Word64 + epoch Text commitHash Text sourceFile Text line Word32