From de1818a6b07e0f430e69bc99a31e2c86246751ee Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Thu, 8 Feb 2024 12:11:59 +0100 Subject: [PATCH] Fix missing process data if process has been deleted meanwhile --- http/handler/api/{restream.go => process.go} | 25 +++++++++++++------ .../api/{restream_test.go => process_test.go} | 0 2 files changed, 17 insertions(+), 8 deletions(-) rename http/handler/api/{restream.go => process.go} (98%) rename http/handler/api/{restream_test.go => process_test.go} (100%) diff --git a/http/handler/api/restream.go b/http/handler/api/process.go similarity index 98% rename from http/handler/api/restream.go rename to http/handler/api/process.go index d7089902..a988ec95 100644 --- a/http/handler/api/restream.go +++ b/http/handler/api/process.go @@ -992,23 +992,32 @@ func (h *RestreamHandler) getProcess(id app.ProcessID, filter filter) (api.Proce } if filter.state { - if state, err := h.restream.GetProcessState(id); err == nil { - info.State = &api.ProcessState{} - info.State.Unmarshal(state) + state, err := h.restream.GetProcessState(id) + if err != nil { + return api.Process{}, err } + + info.State = &api.ProcessState{} + info.State.Unmarshal(state) } if filter.report { - if log, err := h.restream.GetProcessLog(id); err == nil { - info.Report = &api.ProcessReport{} - info.Report.Unmarshal(log) + log, err := h.restream.GetProcessLog(id) + if err != nil { + return api.Process{}, err } + + info.Report = &api.ProcessReport{} + info.Report.Unmarshal(log) } if filter.metadata { - if data, err := h.restream.GetProcessMetadata(id, ""); err == nil { - info.Metadata = api.NewMetadata(data) + data, err := h.restream.GetProcessMetadata(id, "") + if err != nil { + return api.Process{}, err } + + info.Metadata = api.NewMetadata(data) } return info, nil diff --git a/http/handler/api/restream_test.go b/http/handler/api/process_test.go similarity index 100% rename from http/handler/api/restream_test.go rename to http/handler/api/process_test.go