github/troubleshoot
1
0
Fork 0
mirror of https://github.com/replicatedhq/troubleshoot.git synced 2026-02-14 18:29:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Write raw stdout and stderr to files instead of JSON

Browse Source
This commit is contained in:
divolgin
2019-07-22 18:17:44 +00:00
parent e922dc7c96
commit 73cc91dcc8
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/collect/exec.go
View File

@@ -20,8 +20,8 @@ type ExecOutput struct {
}
type execResult struct {
Stdout string `json:"stdout,omitempty"`
Stderr string `json:"stderr,omitempty"`
Stdout []byte `json:"-"`
Stderr []byte `json:"-"`
Error error `json:"error,omitempty"`
}
@@ -74,12 +74,21 @@ func execWithoutTimeout(execCollector *troubleshootv1beta1.Exec, redact bool) er
return err
}
b, err := json.MarshalIndent(output, "", " ")
execOutput.Results[fmt.Sprintf("%s/%s/%s-stdout.txt", pod.Namespace, pod.Name, execCollector.Name)] = output.Stdout
execOutput.Results[fmt.Sprintf("%s/%s/%s-stderr.txt", pod.Namespace, pod.Name, execCollector.Name)] = output.Stderr
if output.Error == nil {
continue
}
errOutput := map[string]string{
"error": output.Error.Error(),
}
b, err := json.MarshalIndent(errOutput, "", " ")
if err != nil {
return err
}
execOutput.Results[fmt.Sprintf("%s/%s/%s", pod.Namespace, pod.Name, execCollector.Name)] = b
execOutput.Results[fmt.Sprintf("%s/%s/%s.json", pod.Namespace, pod.Name, execCollector.Name)] = b
}
if redact {
@@ -142,8 +151,8 @@ func getExecOutputs(client *kubernetes.Clientset, pod corev1.Pod, execCollector
})
return &execResult{
Stdout: stdout.String(),
Stderr: stderr.String(),
Stdout: stdout.Bytes(),
Stderr: stderr.Bytes(),
Error: err,
}, nil
}