Remove logrus.Fatal

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
This commit is contained in:
Christopher Crone 2020-05-14 09:59:12 +02:00
parent ad8a16a922
commit 9bf2924c24
1 changed files with 9 additions and 4 deletions

View File

@ -30,13 +30,13 @@ package main
import ( import (
"context" "context"
"fmt" "fmt"
"log"
"os" "os"
"os/exec" "os/exec"
"os/signal" "os/signal"
"path/filepath" "path/filepath"
"syscall" "syscall"
"github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -68,7 +68,7 @@ func init() {
// into the env of this cli for development // into the env of this cli for development
path, err := filepath.Abs(filepath.Dir(os.Args[0])) path, err := filepath.Abs(filepath.Dir(os.Args[0]))
if err != nil { if err != nil {
log.Fatal(err) fatal(errors.Wrap(err, "unable to get absolute bin path"))
} }
if err := os.Setenv("PATH", fmt.Sprintf("%s:%s", os.Getenv("PATH"), path)); err != nil { if err := os.Setenv("PATH", fmt.Sprintf("%s:%s", os.Getenv("PATH"), path)); err != nil {
panic(err) panic(err)
@ -139,7 +139,7 @@ func main() {
config, err := cliconfig.LoadFile(opts.Config) config, err := cliconfig.LoadFile(opts.Config)
if err != nil { if err != nil {
logrus.Fatal("unable ot find configuration") fatal(errors.Wrap(err, "unable to find configuration file"))
} }
currentContext := opts.Context currentContext := opts.Context
if currentContext == "" { if currentContext == "" {
@ -151,7 +151,7 @@ func main() {
s, err := store.New(store.WithRoot(opts.Config)) s, err := store.New(store.WithRoot(opts.Config))
if err != nil { if err != nil {
logrus.Fatal(err) fatal(errors.Wrap(err, "unable to create context store"))
} }
ctx = apicontext.WithCurrentContext(ctx, currentContext) ctx = apicontext.WithCurrentContext(ctx, currentContext)
ctx = store.WithContextStore(ctx, s) ctx = store.WithContextStore(ctx, s)
@ -200,3 +200,8 @@ func execMoby(ctx context.Context) {
os.Exit(0) os.Exit(0)
} }
} }
func fatal(err error) {
fmt.Fprint(os.Stderr, err)
os.Exit(1)
}