Commite0644f8

committed

review

1 parent5748a10 commite0644f8Copy full SHA for e0644f8

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ func (a LogsAPI) BatchCreateLogs(ctx context.Context, req agentproto.BatchCrea`
`144`	`144`	`ifworkspaceAgent.LogsLength==0&&a.PublishWorkspaceUpdateFn!=nil {`
`145`	`145`	`// If these are the first logs being appended, we publish a UI update`
`146`	`146`	`// to notify the UI that logs are now available.`
`147`		`-err=a.PublishWorkspaceUpdateFn(ctx,&workspaceAgent,wspubsub.WorkspaceEventKindAgentLogsUpdate)`
	`147`	`+err=a.PublishWorkspaceUpdateFn(ctx,&workspaceAgent,wspubsub.WorkspaceEventKindAgentFirstLogs)`
`148`	`148`	`iferr!=nil {`
`149`	`149`	`returnnil,xerrors.Errorf("publish workspace update: %w",err)`
`150`	`150`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ func (api API) patchWorkspaceAgentLogs(rw http.ResponseWriter, r http.Request)`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`api.publishWorkspaceUpdate(ctx,workspace.Workspace.OwnerID, wspubsub.WorkspaceEvent{`
`256`		`-Kind:wspubsub.WorkspaceEventKindAgentLogsUpdate,`
	`256`	`+Kind:wspubsub.WorkspaceEventKindAgentLogsOverflow,`
`257`	`257`	`WorkspaceID:workspace.Workspace.ID,`
`258`	`258`	`AgentID:&workspaceAgent.ID,`
`259`	`259`	`})`
`@@ -285,7 +285,7 @@ func (api API) patchWorkspaceAgentLogs(rw http.ResponseWriter, r http.Request)`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`api.publishWorkspaceUpdate(ctx,workspace.Workspace.OwnerID, wspubsub.WorkspaceEvent{`
`288`		`-Kind:wspubsub.WorkspaceEventKindAgentLogsUpdate,`
	`288`	`+Kind:wspubsub.WorkspaceEventKindAgentFirstLogs,`
`289`	`289`	`WorkspaceID:workspace.Workspace.ID,`
`290`	`290`	`AgentID:&workspaceAgent.ID,`
`291`	`291`	`})`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1698,9 +1698,7 @@ func (api API) watchWorkspace(rw http.ResponseWriter, r http.Request) {`
`1698`	`1698`	`defercancelWorkspaceSubscribe()`
`1699`	`1699`
`1700`	`1700`	`// This is required to show whether the workspace is up-to-date.`
`1701`		`-cancelTemplateSubscribe,err:=api.Pubsub.Subscribe(watchTemplateChannel(workspace.TemplateID),func(ctx context.Context,msg []byte) {`
`1702`		`-sendUpdate(ctx,nil)`
`1703`		`-})`
	`1701`	`+cancelTemplateSubscribe,err:=api.Pubsub.Subscribe(watchTemplateChannel(workspace.TemplateID),sendUpdate)`
`1704`	`1702`	`iferr!=nil {`
`1705`	`1703`	`_=sendEvent(ctx, codersdk.ServerSentEvent{`
`1706`	`1704`	`Type:codersdk.ServerSentEventTypeError,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ const (`
`49`	`49`	`WorkspaceEventKindAppHealthUpdateWorkspaceEventKind="app_health"`
`50`	`50`
`51`	`51`	`WorkspaceEventKindAgentLifecycleUpdateWorkspaceEventKind="agt_lifecycle_update"`
`52`		`-WorkspaceEventKindAgentLogsUpdateWorkspaceEventKind="agt_logs_update"`
`53`	`52`	`WorkspaceEventKindAgentConnectionUpdateWorkspaceEventKind="agt_connection_update"`
	`53`	`+WorkspaceEventKindAgentFirstLogsWorkspaceEventKind="agt_first_logs"`
`54`	`54`	`WorkspaceEventKindAgentLogsOverflowWorkspaceEventKind="agt_logs_overflow"`
`55`	`55`	`WorkspaceEventKindAgentTimeoutWorkspaceEventKind="agt_timeout"`
`56`	`56`	`)`

Comments

(0)