diff --git a/cli/app/logs.go b/cli/app/logs.go index b1566f3f..736bdfa3 100644 --- a/cli/app/logs.go +++ b/cli/app/logs.go @@ -2,7 +2,6 @@ package app import ( "context" - "fmt" "io" "os" "sync" @@ -12,10 +11,10 @@ import ( "coopcloud.tech/abra/pkg/client" "coopcloud.tech/abra/pkg/config" "coopcloud.tech/abra/pkg/recipe" - "coopcloud.tech/abra/pkg/service" "coopcloud.tech/abra/pkg/upstream/stack" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" + "github.com/docker/docker/api/types/swarm" dockerClient "github.com/docker/docker/client" "github.com/sirupsen/logrus" "github.com/urfave/cli" @@ -32,45 +31,6 @@ var logOpts = types.ContainerLogsOptions{ Details: false, } -// stackLogs lists logs for all stack services -func stackLogs(c *cli.Context, app config.App, client *dockerClient.Client) { - filters, err := app.Filters(true, false) - if err != nil { - logrus.Fatal(err) - } - - serviceOpts := types.ServiceListOptions{Filters: filters} - services, err := client.ServiceList(context.Background(), serviceOpts) - if err != nil { - logrus.Fatal(err) - } - - var wg sync.WaitGroup - for _, service := range services { - wg.Add(1) - go func(s string) { - if internal.StdErrOnly { - logOpts.ShowStdout = false - } - - logs, err := client.ServiceLogs(context.Background(), s, logOpts) - if err != nil { - logrus.Fatal(err) - } - defer logs.Close() - - _, err = io.Copy(os.Stdout, logs) - if err != nil && err != io.EOF { - logrus.Fatal(err) - } - }(service.ID) - } - - wg.Wait() - - os.Exit(0) -} - var appLogsCommand = cli.Command{ Name: "logs", Aliases: []string{"l"}, @@ -108,43 +68,68 @@ var appLogsCommand = cli.Command{ logOpts.Since = internal.SinceLogs serviceName := c.Args().Get(1) - if serviceName == "" { - logrus.Debugf("tailing logs for all %s services", app.Recipe) - stackLogs(c, app, cl) - } else { - logrus.Debugf("tailing logs for %s", serviceName) - if err := tailServiceLogs(c, cl, app, serviceName); err != nil { - logrus.Fatal(err) - } + serviceNames := []string{} + if serviceName != "" { + serviceNames = []string{serviceName} + } + err = tailLogs(cl, app, serviceNames) + if err != nil { + logrus.Fatal(err) } return nil }, } -func tailServiceLogs(c *cli.Context, cl *dockerClient.Client, app config.App, serviceName string) error { - filters := filters.NewArgs() - filters.Add("name", fmt.Sprintf("%s_%s", app.StackName(), serviceName)) - - chosenService, err := service.GetService(context.Background(), cl, filters, internal.NoInput) +// tailLogs lists logs for the given app with optional service names to be filtered on +func tailLogs(cl *dockerClient.Client, app config.App, serviceNames []string) error { + f, err := app.Filters(true, false, serviceNames...) if err != nil { - logrus.Fatal(err) + return err } - if internal.StdErrOnly { - logOpts.ShowStdout = false - } - - logs, err := cl.ServiceLogs(context.Background(), chosenService.ID, logOpts) + services, err := cl.ServiceList(context.Background(), types.ServiceListOptions{Filters: f}) if err != nil { - logrus.Fatal(err) + return err } - defer logs.Close() - _, err = io.Copy(os.Stdout, logs) - if err != nil && err != io.EOF { - logrus.Fatal(err) + var wg sync.WaitGroup + for _, service := range services { + wg.Add(1) + go func(serviceID, serviceName string) { + filters := filters.NewArgs() + filters.Add("name", serviceName) + tasks, err := cl.TaskList(context.Background(), types.TaskListOptions{Filters: f}) + if err != nil { + logrus.Fatal(err) + } + if len(tasks) > 0 { + lastTask := tasks[len(tasks)-1].Status + if lastTask.State != swarm.TaskStateRunning { + for _, task := range tasks { + logrus.Errorf("Service %s: State %s: %s", serviceName, task.Status.State, task.Status.Err) + } + } + } + + if internal.StdErrOnly { + logOpts.ShowStdout = false + } + + logs, err := cl.ServiceLogs(context.Background(), serviceID, logOpts) + if err != nil { + logrus.Fatal(err) + } + defer logs.Close() + + _, err = io.Copy(os.Stdout, logs) + if err != nil && err != io.EOF { + logrus.Fatal(err) + } + }(service.ID, service.Spec.Name) } + wg.Wait() + return nil } diff --git a/pkg/config/app.go b/pkg/config/app.go index b3efed2a..b1c0e9aa 100644 --- a/pkg/config/app.go +++ b/pkg/config/app.go @@ -83,8 +83,14 @@ func StackName(appName string) string { // to implement their own validation that the right secrets are matched. In // order to handle these cases, we provide the `appendServiceNames` / // `exactMatch` modifiers. -func (a App) Filters(appendServiceNames, exactMatch bool) (filters.Args, error) { +func (a App) Filters(appendServiceNames, exactMatch bool, services ...string) (filters.Args, error) { filters := filters.NewArgs() + if len(services) > 0 { + for _, serviceName := range services { + filters.Add("name", fmtFilter(appendServiceNames, exactMatch, a.StackName(), serviceName)) + } + return filters, nil + } composeFiles, err := GetComposeFiles(a.Recipe, a.Env) if err != nil { @@ -98,28 +104,25 @@ func (a App) Filters(appendServiceNames, exactMatch bool) (filters.Args, error) } for _, service := range compose.Services { - var filter string - - if appendServiceNames { - if exactMatch { - filter = fmt.Sprintf("^%s_%s", a.StackName(), service.Name) - } else { - filter = fmt.Sprintf("%s_%s", a.StackName(), service.Name) - } - } else { - if exactMatch { - filter = fmt.Sprintf("^%s", a.StackName()) - } else { - filter = fmt.Sprintf("%s", a.StackName()) - } - } - - filters.Add("name", filter) + filters.Add("name", fmtFilter(appendServiceNames, exactMatch, a.StackName(), service.Name)) } return filters, nil } +func fmtFilter(appendMode bool, exact bool, stack string, service string) string { + if appendMode { + if exact { + return fmt.Sprintf("^%s_%s", stack, service) + } + return fmt.Sprintf("%s_%s", stack, service) + } + if exact { + return fmt.Sprintf("^%s", stack) + } + return fmt.Sprintf("%s", stack) +} + // ByServer sort a slice of Apps type ByServer []App @@ -340,7 +343,7 @@ func TemplateAppEnvSample(recipeName, appName, server, domain string) error { return fmt.Errorf("%s already exists?", appEnvPath) } - err = ioutil.WriteFile(appEnvPath, envSample, 0664) + err = ioutil.WriteFile(appEnvPath, envSample, 0o664) if err != nil { return err } @@ -602,7 +605,7 @@ func GetLabel(compose *composetypes.Config, stackName string, label string) stri // GetTimeoutFromLabel reads the timeout value from docker label "coop-cloud.${STACK_NAME}.TIMEOUT" and returns 50 as default value func GetTimeoutFromLabel(compose *composetypes.Config, stackName string) (int, error) { - var timeout = 50 // Default Timeout + timeout := 50 // Default Timeout var err error = nil if timeoutLabel := GetLabel(compose, stackName, "timeout"); timeoutLabel != "" { logrus.Debugf("timeout label: %s", timeoutLabel)