From 6869c6fe6faf7343769d146b8171ab5084b9b56c Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 9 Dec 2018 18:05:40 -0800 Subject: Send cli errors to stderr --- cli/ask_credentials.go | 2 +- cli/create_admin.go | 4 ++-- cli/flush_sessions.go | 2 +- cli/reset_password.go | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'cli') diff --git a/cli/ask_credentials.go b/cli/ask_credentials.go index 9021d9b..7bd60a0 100644 --- a/cli/ask_credentials.go +++ b/cli/ask_credentials.go @@ -17,7 +17,7 @@ func askCredentials() (string, string) { fd := int(os.Stdin.Fd()) if !terminal.IsTerminal(fd) { - fmt.Fprintf(os.Stderr, "This is not a terminal, exiting.") + fmt.Fprintf(os.Stderr, "This is not a terminal, exiting.\n") os.Exit(1) } diff --git a/cli/create_admin.go b/cli/create_admin.go index 03da6b0..35f0c4a 100644 --- a/cli/create_admin.go +++ b/cli/create_admin.go @@ -24,7 +24,7 @@ func createAdmin(store *storage.Storage) { } if err := user.ValidateUserCreation(); err != nil { - fmt.Println(err) + fmt.Fprintf(os.Stderr, "%v\n", err) os.Exit(1) } @@ -34,7 +34,7 @@ func createAdmin(store *storage.Storage) { } if err := store.CreateUser(user); err != nil { - fmt.Println(err) + fmt.Fprintf(os.Stderr, "%v\n", err) os.Exit(1) } } diff --git a/cli/flush_sessions.go b/cli/flush_sessions.go index 5e16d3c..43e6e93 100644 --- a/cli/flush_sessions.go +++ b/cli/flush_sessions.go @@ -14,7 +14,7 @@ import ( func flushSessions(store *storage.Storage) { fmt.Println("Flushing all sessions (disconnect users)") if err := store.FlushAllSessions(); err != nil { - fmt.Println(err) + fmt.Fprintf(os.Stderr, "%v\n", err) os.Exit(1) } } diff --git a/cli/reset_password.go b/cli/reset_password.go index b9e5150..4b4f78e 100644 --- a/cli/reset_password.go +++ b/cli/reset_password.go @@ -15,23 +15,23 @@ func resetPassword(store *storage.Storage) { username, password := askCredentials() user, err := store.UserByUsername(username) if err != nil { - fmt.Println(err) + fmt.Fprintf(os.Stderr, "%v\n", err) os.Exit(1) } if user == nil { - fmt.Println("User not found!") + fmt.Fprintf(os.Stderr, "User not found!\n") os.Exit(1) } user.Password = password if err := user.ValidatePassword(); err != nil { - fmt.Println(err) + fmt.Fprintf(os.Stderr, "%v\n", err) os.Exit(1) } if err := store.UpdateUser(user); err != nil { - fmt.Println(err) + fmt.Fprintf(os.Stderr, "%v\n", err) os.Exit(1) } -- cgit v1.2.3