forks/miniflux
1
0
Fork 0
Code Releases Activity

Send cli errors to stderr

Browse source
This commit is contained in:
Frederic Guillot 2018-12-09 18:05:40 -08:00
parent 59d8e9b95e
commit 6869c6fe6f
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/ask_credentials.go
View file

@ -17,7 +17,7 @@ func askCredentials() (string, string) {
fd := int(os.Stdin.Fd()) fd := int(os.Stdin.Fd())
if !terminal.IsTerminal(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) os.Exit(1)
} }

4
cli/create_admin.go
View file

@ -24,7 +24,7 @@ func createAdmin(store *storage.Storage) {
} }
if err := user.ValidateUserCreation(); err != nil { if err := user.ValidateUserCreation(); err != nil {
fmt.Println(err) fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1) os.Exit(1)
} }
@ -34,7 +34,7 @@ func createAdmin(store *storage.Storage) {
} }
if err := store.CreateUser(user); err != nil { if err := store.CreateUser(user); err != nil {
fmt.Println(err) fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1) os.Exit(1)
} }
} }

2
cli/flush_sessions.go
View file

@ -14,7 +14,7 @@ import (
func flushSessions(store *storage.Storage) { func flushSessions(store *storage.Storage) {
fmt.Println("Flushing all sessions (disconnect users)") fmt.Println("Flushing all sessions (disconnect users)")
if err := store.FlushAllSessions(); err != nil { if err := store.FlushAllSessions(); err != nil {
fmt.Println(err) fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1) os.Exit(1)
} }
} }

8
cli/reset_password.go
View file

@ -15,23 +15,23 @@ func resetPassword(store *storage.Storage) {
username, password := askCredentials() username, password := askCredentials()
user, err := store.UserByUsername(username) user, err := store.UserByUsername(username)
if err != nil { if err != nil {
fmt.Println(err) fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1) os.Exit(1)
} }
if user == nil { if user == nil {
fmt.Println("User not found!") fmt.Fprintf(os.Stderr, "User not found!\n")
os.Exit(1) os.Exit(1)
} }
user.Password = password user.Password = password
if err := user.ValidatePassword(); err != nil { if err := user.ValidatePassword(); err != nil {
fmt.Println(err) fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1) os.Exit(1)
} }
if err := store.UpdateUser(user); err != nil { if err := store.UpdateUser(user); err != nil {
fmt.Println(err) fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1) os.Exit(1)
} }