mirror of
https://github.com/matrix-org/dendrite
synced 2024-11-17 07:10:51 +01:00
Improve logging in upgrade tests
This commit is contained in:
parent
bdaae060cc
commit
503d9c7586
1 changed files with 15 additions and 11 deletions
|
@ -381,18 +381,22 @@ func runImage(dockerClient *client.Client, volumeName, version, imageID string)
|
|||
lastErr = nil
|
||||
break
|
||||
}
|
||||
if lastErr != nil {
|
||||
logs, err := dockerClient.ContainerLogs(context.Background(), containerID, types.ContainerLogsOptions{
|
||||
ShowStdout: true,
|
||||
ShowStderr: true,
|
||||
})
|
||||
// ignore errors when cannot get logs, it's just for debugging anyways
|
||||
if err == nil {
|
||||
logbody, err := io.ReadAll(logs)
|
||||
if err == nil {
|
||||
log.Printf("Container logs:\n\n%s\n\n", string(logbody))
|
||||
logs, err := dockerClient.ContainerLogs(context.Background(), containerID, types.ContainerLogsOptions{
|
||||
ShowStdout: true,
|
||||
ShowStderr: true,
|
||||
Follow: true,
|
||||
})
|
||||
// ignore errors when cannot get logs, it's just for debugging anyways
|
||||
if err == nil {
|
||||
go func() {
|
||||
for {
|
||||
if body, err := io.ReadAll(logs); err == nil && len(body) > 0 {
|
||||
log.Printf("%s: %s", version, string(body))
|
||||
} else {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
}()
|
||||
}
|
||||
return baseURL, containerID, lastErr
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue