Skip to content

Commit d1f804e

Browse files
fix logs display for single jobs (#739)
1 parent 0d60a4e commit d1f804e

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

app/src/App/SQLite.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ type SelectJobRequest =
198198

199199
selectJob :: SQLite -> SelectJobRequest -> Effect { unreadableLogs :: Array String, job :: Either String (Maybe Job) }
200200
selectJob db { level: maybeLogLevel, since, jobId: JobId jobId } = do
201-
let logLevel = fromMaybe Error maybeLogLevel
201+
let logLevel = fromMaybe Info maybeLogLevel
202202
{ fail: unreadableLogs, success: logs } <- selectLogsByJob db (JobId jobId) logLevel since
203203
-- Failing to decode a log should not prevent us from returning a job, so we pass
204204
-- failures through to be handled by application code

app/src/App/Server/Router.purs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@ module Registry.App.Server.Router where
33
import Registry.App.Prelude hiding ((/))
44

55
import Data.Codec.JSON as CJ
6+
import Data.Date as Date
7+
import Data.DateTime (DateTime(..))
68
import Data.DateTime as DateTime
9+
import Data.Enum as Enum
710
import Data.Time.Duration (Hours(..), negateDuration)
811
import Effect.Aff as Aff
912
import Effect.Class.Console as Console
1013
import HTTPurple (Method(..), Request, Response)
1114
import HTTPurple as HTTPurple
1215
import HTTPurple.Status as Status
16+
import Partial.Unsafe (unsafePartial)
1317
import Registry.API.V1 (Route(..))
1418
import Registry.API.V1 as V1
1519
import Registry.App.API as API
@@ -24,6 +28,12 @@ import Run (Run)
2428
import Run as Run
2529
import Run.Except as Run.Except
2630

31+
-- | The earliest date for which we have job logs (registry server launch date)
32+
registryLaunch :: DateTime
33+
registryLaunch = DateTime date bottom
34+
where
35+
date = Date.canonicalDate (unsafePartial fromJust $ Enum.toEnum 2026) Date.January (unsafePartial fromJust $ Enum.toEnum 31)
36+
2737
runRouter :: ServerEnv -> Effect Unit
2838
runRouter env = do
2939
-- Read port from SERVER_PORT env var (optional, HTTPurple defaults to 8080)
@@ -117,9 +127,7 @@ router { route, method, body } = HTTPurple.usingCont case route, method of
117127
Right jobs -> jsonOk (CJ.array V1.jobCodec) jobs
118128

119129
Job jobId { level: maybeLogLevel, since }, Get -> do
120-
now <- liftEffect nowUTC
121-
let oneHourAgo = fromMaybe now $ DateTime.adjust (negateDuration (Hours 1.0)) now
122-
lift (Run.Except.runExcept $ Db.selectJob { jobId, level: maybeLogLevel, since: fromMaybe oneHourAgo since }) >>= case _ of
130+
lift (Run.Except.runExcept $ Db.selectJob { jobId, level: maybeLogLevel, since: fromMaybe registryLaunch since }) >>= case _ of
123131
Left err -> do
124132
lift $ Log.error $ "Error while fetching job: " <> err
125133
HTTPurple.internalServerError $ "Error while fetching job: " <> err

0 commit comments

Comments
 (0)