From 81d7e168629685a8313d395696f9ac548b9286f2 Mon Sep 17 00:00:00 2001 From: Ulisse mini Date: Fri, 25 Jan 2019 13:42:27 -0500 Subject: [PATCH] cmd, main: Return instead of os.Exit(0), use ioutil.Discard for default logger * logger: change nil bytes.Buffer into ioutil.Discard * cmd.go: Clearify imports * cmd.go: Use return instead of os.Exit(0) --- cmd/ssh-chat/cmd.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cmd/ssh-chat/cmd.go b/cmd/ssh-chat/cmd.go index 7c7d000..bfab292 100644 --- a/cmd/ssh-chat/cmd.go +++ b/cmd/ssh-chat/cmd.go @@ -12,10 +12,10 @@ import ( "github.com/alexcesaro/log" "github.com/alexcesaro/log/golog" - "github.com/jessevdk/go-flags" + flags "github.com/jessevdk/go-flags" "golang.org/x/crypto/ssh" - "github.com/shazow/ssh-chat" + sshchat "github.com/shazow/ssh-chat" "github.com/shazow/ssh-chat/chat" "github.com/shazow/ssh-chat/chat/message" "github.com/shazow/ssh-chat/sshd" @@ -57,7 +57,6 @@ func main() { if p == nil { fmt.Print(err) } - os.Exit(1) return } @@ -69,7 +68,7 @@ func main() { if options.Version { fmt.Println(Version) - os.Exit(0) + return } // Figure out the log level @@ -177,7 +176,6 @@ func main() { <-sig // Wait for ^C signal fmt.Fprintln(os.Stderr, "Interrupt signal detected, shutting down.") - os.Exit(0) } func fromFile(path string, handler func(line []byte) error) error {