Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set App.ErrWriter in App.Setup() #1100

Merged
merged 2 commits into from Apr 2, 2020
Merged

Set App.ErrWriter in App.Setup() #1100

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22b6dba
Set App.ErrWriter in App.Setup()
Mar 31, 2020
fed64f3
add tests
Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 5 additions & 14 deletions app.go
View file
Open in desktop
Expand Up @@ -163,6 +163,10 @@ func (a *App) Setup() {
a.Writer = os.Stdout
}

if a.ErrWriter == nil {
a.ErrWriter = os.Stderr
}

var newCommands []*Command

for _, c := range a.Commands {
Expand Down Expand Up @@ -196,10 +200,6 @@ func (a *App) Setup() {
if a.Metadata == nil {
a.Metadata = make(map[string]interface{})
}

if a.Writer == nil {
a.Writer = os.Stdout
}
}

func (a *App) newFlagSet() (*flag.FlagSet, error) {
Expand Down Expand Up @@ -326,7 +326,7 @@ func (a *App) RunContext(ctx context.Context, arguments []string) (err error) {
// code in the cli.ExitCoder
func (a *App) RunAndExitOnError() {
if err := a.Run(os.Args); err != nil {
_, _ = fmt.Fprintln(a.errWriter(), err)
_, _ = fmt.Fprintln(a.ErrWriter, err)
OsExiter(1)
}
}
Expand Down Expand Up @@ -480,15 +480,6 @@ func (a *App) VisibleFlags() []Flag {
return visibleFlags(a.Flags)
}

func (a *App) errWriter() io.Writer {
// When the app ErrWriter is nil use the package level one.
if a.ErrWriter == nil {
return ErrWriter
}

return a.ErrWriter
}

func (a *App) appendFlag(fl Flag) {
if !hasFlag(a.Flags, fl) {
a.Flags = append(a.Flags, fl)
Expand Down