codegod100/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: use cli context vs creating new one

Browse Source
This commit is contained in:
Roxie Gibson
2021-09-16 11:17:56 +01:00
parent a74a8bc21b
commit 0a1c73bf00
8 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cli/app/logs.go
View File

@ -1,7 +1,6 @@
package app
import (
"context"
"fmt"
"io"
"os"
@ -18,12 +17,11 @@ import (
)
// stackLogs lists logs for all stack services
func stackLogs(stackName string, client *dockerClient.Client) {
ctx := context.Background()
func stackLogs(c *cli.Context, stackName string, client *dockerClient.Client) {
filters := filters.NewArgs()
filters.Add("name", stackName)
serviceOpts := types.ServiceListOptions{Filters: filters}
services, err := client.ServiceList(ctx, serviceOpts)
services, err := client.ServiceList(c.Context, serviceOpts)
if err != nil {
logrus.Fatal(err)
}
@ -40,7 +38,7 @@ func stackLogs(stackName string, client *dockerClient.Client) {
Tail: "20",
Timestamps: true,
}
logs, err := client.ServiceLogs(ctx, s, logOpts)
logs, err := client.ServiceLogs(c.Context, s, logOpts)
if err != nil {
logrus.Fatal(err)
}
@ -65,7 +63,6 @@ var appLogsCommand = &cli.Command{
Action: func(c *cli.Context) error {
app := internal.ValidateApp(c)
ctx := context.Background()
cl, err := client.New(app.Server)
if err != nil {
logrus.Fatal(err)
@ -73,8 +70,12 @@ var appLogsCommand = &cli.Command{
serviceName := c.Args().Get(1)
if serviceName == "" {
<<<<<<< HEAD
logrus.Debug("tailing logs for all app services")
stackLogs(app.StackName(), cl)
=======
stackLogs(c, app.StackName(), cl)
>>>>>>> bcaf285 (refactor: use cli context vs creating new one)
}
logrus.Debugf("tailing logs for '%s'", serviceName)
@ -82,7 +83,7 @@ var appLogsCommand = &cli.Command{
filters := filters.NewArgs()
filters.Add("name", service)
serviceOpts := types.ServiceListOptions{Filters: filters}
services, err := cl.ServiceList(ctx, serviceOpts)
services, err := cl.ServiceList(c.Context, serviceOpts)
if err != nil {
logrus.Fatal(err)
}
@ -98,7 +99,7 @@ var appLogsCommand = &cli.Command{
Tail: "20",
Timestamps: true,
}
logs, err := cl.ServiceLogs(ctx, services[0].ID, logOpts)
logs, err := cl.ServiceLogs(c.Context, services[0].ID, logOpts)
if err != nil {
logrus.Fatal(err)
}