Skip to content

misc: Main sync develop 16dec #6182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 16, 2024
Merged

misc: Main sync develop 16dec #6182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3f68db
fix: panic handling for get workflow logs (#6168)
Shivam-nagar23 Dec 13, 2024
9c1d2d3
main sync develop
vikramdevtron Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion api/restHandler/app/pipeline/configure/BuildPipelineRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,11 @@ func (handler *PipelineConfigRestHandlerImpl) GetBuildLogs(w http.ResponseWriter
}(ctx.Done(), cn.CloseNotify())
}
defer cancel()
defer cleanUp()
defer func() {
if cleanUp != nil {
cleanUp()
}
}()
handler.streamOutput(w, logsReader, lastSeenMsgId)
}

Expand Down
6 changes: 5 additions & 1 deletion api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1808,7 +1808,11 @@ func (handler *PipelineConfigRestHandlerImpl) GetPrePostDeploymentLogs(w http.Re
}(ctx.Done(), cn.CloseNotify())
}
defer cancel()
defer cleanUp()
defer func() {
if cleanUp != nil {
cleanUp()
}
}()
handler.streamOutput(w, logsReader, lastSeenMsgId)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/pipeline/CiHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ func (impl *CiHandlerImpl) GetRunningWorkflowLogs(workflowId int) (*bufio.Reader

func (impl *CiHandlerImpl) getWorkflowLogs(ciWorkflow *pipelineConfig.CiWorkflow) (*bufio.Reader, func() error, error) {
if string(v1alpha1.NodePending) == ciWorkflow.PodStatus {
return bufio.NewReader(strings.NewReader("")), nil, nil
return bufio.NewReader(strings.NewReader("")), func() error { return nil }, nil
}
ciLogRequest := types.BuildLogRequest{
PodName: ciWorkflow.PodName,
Expand Down
Loading