Skip to content

Commit 32688bb

Browse files
committed
chore: logging improvements
1 parent cc7cb4f commit 32688bb

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

pkg/data_collector/data_collector.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,20 @@ func (c *DataCollector) PodExecutor(namespace string, pod string, command []stri
158158
TTY: true,
159159
}, scheme.ParameterCodec)
160160

161-
exec, _ := remotecommand.NewSPDYExecutor(c.K8sRestConfig, "POST", req.URL())
161+
exec, err := remotecommand.NewSPDYExecutor(c.K8sRestConfig, "POST", req.URL())
162+
if err != nil {
163+
return nil, err
164+
}
162165
var stdout, stderr bytes.Buffer
163-
err := exec.StreamWithContext(ctx, remotecommand.StreamOptions{
166+
err = exec.StreamWithContext(ctx, remotecommand.StreamOptions{
164167
Stdin: nil,
165168
Stdout: &stdout,
166169
Stderr: &stderr,
167170
})
168-
return stdout.Bytes(), err
171+
if stdout.Len() > 0 || stderr.Len() > 0 {
172+
response := append(stdout.Bytes(), stderr.Bytes()...)
173+
return response, nil
174+
} else {
175+
return nil, err
176+
}
169177
}

pkg/jobs/job.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ func (j Job) Collect(dc *data_collector.DataCollector) error {
4141
return jobResults.Error
4242
}
4343

44-
dc.Logger.Printf("\tJob %s completed successfully\n", j.Name)
4544
for fileName, fileValue := range jobResults.Files {
4645
err := os.MkdirAll(path.Dir(fileName), os.ModePerm)
4746
if err != nil {
@@ -53,7 +52,9 @@ func (j Job) Collect(dc *data_collector.DataCollector) error {
5352
return err
5453
}
5554
_ = file.Close()
55+
dc.Logger.Printf("\tJob %s wrote file %s\n", j.Name, fileName)
5656
}
57+
dc.Logger.Printf("\tJob %s completed successfully\n---\n", j.Name)
5758
return nil
5859
}
5960
}

0 commit comments

Comments
 (0)