From 8cc93e0dbe0eef31ab3e7aae64de56d523986818 Mon Sep 17 00:00:00 2001 From: Mikhail Bragin Date: Thu, 10 Mar 2022 18:14:07 +0100 Subject: [PATCH] Init logger for every cmd (#259) --- client/cmd/down.go | 7 +++++++ client/cmd/login.go | 8 ++++++++ client/cmd/status.go | 8 ++++++++ client/cmd/up.go | 8 ++++++++ 4 files changed, 31 insertions(+) diff --git a/client/cmd/down.go b/client/cmd/down.go index 31f4c5e77..c9549fc12 100644 --- a/client/cmd/down.go +++ b/client/cmd/down.go @@ -2,6 +2,7 @@ package cmd import ( "context" + "github.com/wiretrustee/wiretrustee/util" "time" log "github.com/sirupsen/logrus" @@ -16,6 +17,12 @@ var downCmd = &cobra.Command{ RunE: func(cmd *cobra.Command, args []string) error { SetFlagsFromEnvVars() + err := util.InitLog(logLevel, logFile) + if err != nil { + log.Errorf("failed initializing log %v", err) + return err + } + ctx, cancel := context.WithTimeout(context.Background(), time.Second*3) defer cancel() diff --git a/client/cmd/login.go b/client/cmd/login.go index dbbc16d14..b45cf1c42 100644 --- a/client/cmd/login.go +++ b/client/cmd/login.go @@ -3,6 +3,7 @@ package cmd import ( "context" "fmt" + "github.com/wiretrustee/wiretrustee/util" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -16,6 +17,13 @@ var loginCmd = &cobra.Command{ Short: "login to the Wiretrustee Management Service (first run)", RunE: func(cmd *cobra.Command, args []string) error { SetFlagsFromEnvVars() + + err := util.InitLog(logLevel, logFile) + if err != nil { + log.Errorf("failed initializing log %v", err) + return err + } + ctx := internal.CtxInitState(context.Background()) // workaround to run without service diff --git a/client/cmd/status.go b/client/cmd/status.go index 44daf5e90..6661f3857 100644 --- a/client/cmd/status.go +++ b/client/cmd/status.go @@ -2,6 +2,7 @@ package cmd import ( "context" + "github.com/wiretrustee/wiretrustee/util" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -16,6 +17,13 @@ var statusCmd = &cobra.Command{ Short: "status of the Wiretrustee Service", RunE: func(cmd *cobra.Command, args []string) error { SetFlagsFromEnvVars() + + err := util.InitLog(logLevel, logFile) + if err != nil { + log.Errorf("failed initializing log %v", err) + return err + } + ctx := internal.CtxInitState(context.Background()) conn, err := DialClientGRPCServer(ctx, daemonAddr) diff --git a/client/cmd/up.go b/client/cmd/up.go index 0d8f3fdce..b22a0b661 100644 --- a/client/cmd/up.go +++ b/client/cmd/up.go @@ -3,6 +3,7 @@ package cmd import ( log "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "github.com/wiretrustee/wiretrustee/util" "github.com/wiretrustee/wiretrustee/client/internal" "github.com/wiretrustee/wiretrustee/client/proto" @@ -13,6 +14,13 @@ var upCmd = &cobra.Command{ Short: "install, login and start wiretrustee client", RunE: func(cmd *cobra.Command, args []string) error { SetFlagsFromEnvVars() + + err := util.InitLog(logLevel, logFile) + if err != nil { + log.Errorf("failed initializing log %v", err) + return err + } + ctx := internal.CtxInitState(cmd.Context()) // workaround to run without service