From 77057d1f516f2d2afa3c028a8e13a3a129eb9193 Mon Sep 17 00:00:00 2001 From: Guilherme Salazar Date: Thu, 12 Dec 2019 13:35:43 -0800 Subject: [PATCH] refactor(main) flag parsing and validation in init --- main.go | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/main.go b/main.go index 4325c94..059fa74 100644 --- a/main.go +++ b/main.go @@ -14,6 +14,15 @@ import ( var socket = flag.String("socket", "", "Socket to listen into") +func init() { + flag.Parse() + + if *socket == "" { + flag.Usage() + os.Exit(2) + } +} + func runServer(listener net.Listener) { var handle codec.MsgpackHandle handle.ReaderBufferSize = 4096 @@ -37,24 +46,19 @@ func runServer(listener net.Listener) { } func main() { - flag.Parse() - - if *socket != "" { - - err := os.Remove(*socket) - if err != nil && !os.IsNotExist(err) { - log.Printf(`removing "%s": %s`, socket, err) - return - } - - listener, err := net.Listen("unix", *socket) - if err != nil { - log.Printf(`listen("%s"): %s`, socket, err) - return - } - - rpc.RegisterName("plugin", newServer()) - - runServer(listener) + err := os.Remove(*socket) + if err != nil && !os.IsNotExist(err) { + log.Printf(`removing "%s": %s`, socket, err) + return } + + listener, err := net.Listen("unix", *socket) + if err != nil { + log.Printf(`listen("%s"): %s`, socket, err) + return + } + + rpc.RegisterName("plugin", newServer()) + + runServer(listener) }