Skip to content

Commit 1d60d82

Browse files
committed
cmd: Don't use Logrus to call panic
While the use of Logrus is convenient, it causes unneeded fluff to be printed during a panic which distracts from finding the cause of the panic in the first place. Fallout from containers#840 containers#1055
1 parent 37c9a8d commit 1d60d82

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

src/cmd/create.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ func init() {
100100
createCmd.SetHelpFunc(createHelp)
101101

102102
if err := createCmd.RegisterFlagCompletionFunc("distro", completionDistroNames); err != nil {
103-
logrus.Panicf("failed to register flag completion function: %v", err)
103+
panic(fmt.Sprintf("failed to register flag completion function: %v", err))
104104
}
105105
if err := createCmd.RegisterFlagCompletionFunc("image", completionImageNames); err != nil {
106-
logrus.Panicf("failed to register flag completion function: %v", err)
106+
panic(fmt.Sprintf("failed to register flag completion function: %v", err))
107107
}
108108

109109
rootCmd.AddCommand(createCmd)

src/cmd/enter.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"strings"
2424

2525
"github.com/containers/toolbox/pkg/utils"
26-
"github.com/sirupsen/logrus"
2726
"github.com/spf13/cobra"
2827
)
2928

@@ -64,10 +63,10 @@ func init() {
6463
"Enter a toolbox container for a different operating system release than the host")
6564

6665
if err := enterCmd.RegisterFlagCompletionFunc("container", completionContainerNames); err != nil {
67-
logrus.Panicf("failed to register flag completion function: %v", err)
66+
panic(fmt.Sprintf("failed to register flag completion function: %v", err))
6867
}
6968
if err := enterCmd.RegisterFlagCompletionFunc("distro", completionDistroNames); err != nil {
70-
logrus.Panicf("failed to register flag completion function: %v", err)
69+
panic(fmt.Sprintf("failed to register flag completion function: %v", err))
7170
}
7271

7372
enterCmd.SetHelpFunc(enterHelp)

src/cmd/root.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func init() {
117117
persistentFlags.CountVarP(&rootFlags.verbose, "verbose", "v", "Set log-level to 'debug'")
118118

119119
if err := rootCmd.RegisterFlagCompletionFunc("log-level", completionLogLevels); err != nil {
120-
logrus.Panicf("failed to register flag completion function: %v", err)
120+
panic(fmt.Sprintf("failed to register flag completion function: %v", err))
121121
}
122122

123123
rootCmd.SetHelpFunc(rootHelp)

src/cmd/run.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ func init() {
7474
runCmd.SetHelpFunc(runHelp)
7575

7676
if err := runCmd.RegisterFlagCompletionFunc("container", completionContainerNames); err != nil {
77-
logrus.Panicf("failed to register flag completion function: %v", err)
77+
panic(fmt.Sprintf("failed to register flag completion function: %v", err))
7878
}
7979
if err := runCmd.RegisterFlagCompletionFunc("distro", completionDistroNames); err != nil {
80-
logrus.Panicf("failed to register flag completion function: %v", err)
80+
panic(fmt.Sprintf("failed to register flag completion function: %v", err))
8181
}
8282

8383
rootCmd.AddCommand(runCmd)

0 commit comments

Comments
 (0)