Start9/registry
2
0
Fork 0
mirror of https://github.com/Start9Labs/registry.git synced 2026-03-31 04:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

conflict resolution (#77)

Browse Source
This commit is contained in:
Keagan McClelland
2021-11-23 15:55:45 -07:00
parent e6009e9658
commit ca5cbefd68
2 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/Handler/ErrorLogs.hs
View File

@@ -8,20 +8,25 @@ import Data.Aeson ( (.:)
, withObject
, withText
)
import qualified Data.Text as T
import Foundation
import Settings ( AppSettings(errorLogRoot) )
import Startlude hiding ( Handler )
import System.FilePath ( (<.>)
, (</>)
import Model ( EntityField(ErrorLogRecordIncidents)
, ErrorLogRecord(ErrorLogRecord)
)
import Yesod.Core ( getsYesod
, requireCheckJsonBody
import Startlude hiding ( Handler )
import Yesod.Core ( requireCheckJsonBody )
import Yesod.Persist ( (+=.)
, runDB
, upsert
)
data ErrorLog = ErrorLog
{ errorLogEpoch :: Word64
, errorLogMessage :: Text
{ errorLogEpoch :: Word64
, errorLogCommitHash :: Text
, errorLogSourceFile :: Text
, errorLogLine :: Word32
, errorLogTarget :: Text
, errorLogLevel :: Text
, errorLogMessage :: Text
}
deriving (Eq, Show)
@@ -33,14 +38,27 @@ instance FromJSON ErrorLog where
Nothing -> fail "Invalid Log Epoch"
Just x -> pure x
)
errorLogMessage <- o .: "log-message"
errorLogCommitHash <- o .: "commit-hash"
errorLogSourceFile <- o .: "file"
errorLogLine <- o .: "line"
errorLogLevel <- o .: "level"
errorLogTarget <- o .: "target"
errorLogMessage <- o .: "log-message"
pure ErrorLog { .. }
postErrorLogsR :: Handler ()
postErrorLogsR = do
ErrorLog {..} <- requireCheckJsonBody @_ @ErrorLog
root <- getsYesod $ errorLogRoot . appSettings
void $ liftIO $ forkIO $ appendFile (root </> show errorLogEpoch <.> "log") $ if "\n" `T.isSuffixOf` errorLogMessage
then errorLogMessage
else T.snoc errorLogMessage '\n'
void $ runDB $ do
now <- liftIO getCurrentTime
let logRecord = ErrorLogRecord now
errorLogEpoch
errorLogCommitHash
errorLogSourceFile
errorLogLine
errorLogTarget
errorLogLevel
errorLogMessage
1
upsert logRecord [ErrorLogRecordIncidents +=. 1]