basebuilder/abra
0
0
Fork 0
forked from toolshed/abra
Code Pull Requests Activity

fix: defers after checking for err

Browse Source
This commit is contained in:
Roxie Gibson
2021-08-31 16:47:38 +01:00
parent 542e9eea5c
commit 7835c1f91d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/app/cp.go
View File

@ -111,10 +111,10 @@ var appCpCommand = &cli.Command{
} }
} else { } else {
content, _, err := cl.CopyFromContainer(ctx, container.ID, srcPath) content, _, err := cl.CopyFromContainer(ctx, container.ID, srcPath)
defer content.Close()
if err != nil { if err != nil {
logrus.Fatal(err) logrus.Fatal(err)
} }
defer content.Close()
fromTarOpts := &archive.TarOptions{NoOverwriteDirNonDir: true, Compression: archive.Gzip} fromTarOpts := &archive.TarOptions{NoOverwriteDirNonDir: true, Compression: archive.Gzip}
if err := archive.Untar(content, dstPath, fromTarOpts); err != nil { if err := archive.Untar(content, dstPath, fromTarOpts); err != nil {
logrus.Fatal(err) logrus.Fatal(err)

8
cli/app/logs.go
View File

@ -42,6 +42,10 @@ func stackLogs(stackName string, client *dockerClient.Client) {
Timestamps: true, Timestamps: true,
} }
logs, err := client.ServiceLogs(ctx, s, logOpts) logs, err := client.ServiceLogs(ctx, s, logOpts)
if err != nil {
logrus.Fatal(err)
}
// defer after err check as any err returns a nil io.ReadCloser
defer logs.Close() defer logs.Close()
_, err = io.Copy(os.Stdout, logs) _, err = io.Copy(os.Stdout, logs)
@ -107,6 +111,10 @@ var appLogsCommand = &cli.Command{
Timestamps: true, Timestamps: true,
} }
logs, err := cl.ServiceLogs(ctx, services[0].ID, logOpts) logs, err := cl.ServiceLogs(ctx, services[0].ID, logOpts)
if err != nil {
logrus.Fatal(err)
}
// defer after err check as any err returns a nil io.ReadCloser
defer logs.Close() defer logs.Close()
_, err = io.Copy(os.Stdout, logs) _, err = io.Copy(os.Stdout, logs)