Fix frontend log streaming

kylecarbs · kylecarbs · commit 4dee930b5556 · 2022-11-06T21:34:58.000Z
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/provisionerjoblogs.sql b/coderd/database/queries/provisionerjoblogs.sql
@@ -6,8 +6,8 @@ FROM
 WHERE
 	job_id = @job_id
 	AND (
-		id >= @created_after
-		OR id <= @created_before
+		id > @created_after
+		OR id < @created_before
 	) ORDER BY id;
 
 -- name: InsertProvisionerJobLogs :many
diff --git a/site/src/xServices/workspaceBuild/workspaceBuildXService.ts b/site/src/xServices/workspaceBuild/workspaceBuildXService.ts
@@ -125,11 +125,14 @@ export const workspaceBuildMachine = createMachine(
         API.getWorkspaceBuildLogs(ctx.buildId, ctx.timeCursor),
       streamWorkspaceBuildLogs: (ctx) => async (callback) => {
         return new Promise<void>((resolve, reject) => {
+          if (!ctx.logs) {
+            return reject("logs must be set")
+          }
           const proto = location.protocol === "https:" ? "wss:" : "ws:"
           const socket = new WebSocket(
             `${proto}//${location.host}/api/v2/workspacebuilds/${
               ctx.buildId
-            }/logs?follow=true&after=${ctx.timeCursor.getTime()}`,
+            }/logs?follow=true&after=${ctx.logs[ctx.logs.length - 1].id}`,
           )
           socket.binaryType = "blob"
           socket.addEventListener("message", (event) => {
