From fc164c433acd325af4c84d427e5f68840fd51490 Mon Sep 17 00:00:00 2001 From: Hikmatulloh Hari Mukti Date: Fri, 13 Sep 2024 21:18:53 +0700 Subject: [PATCH] chore: fitactivity simplify notify signal --- cmd/fitactivity/main.go | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/cmd/fitactivity/main.go b/cmd/fitactivity/main.go index b4e5cdf..b813075 100644 --- a/cmd/fitactivity/main.go +++ b/cmd/fitactivity/main.go @@ -74,18 +74,9 @@ Flags: ` func main() { - ctx, cancel := context.WithCancel(context.Background()) + ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt) defer cancel() - quit := make(chan os.Signal, 1) - signal.Notify(quit, os.Interrupt) - - go func() { - sig := <-quit - cancel() - fmt.Printf(" %v ", sig) - }() - fs := flag.NewFlagSet("main", flag.ExitOnError) fs.Usage = func() { fmt.Fprint(os.Stderr, mainUsage) } @@ -138,8 +129,10 @@ func printerror(fs *flag.FlagSet, command string, err error) { fs.Usage() } else if errors.Is(err, errPrintUsageAndExit) { fs.Usage() + } else if errors.Is(err, context.Canceled) { + fmt.Fprintf(os.Stderr, "~ %s: %v\n", command, err) } else { - fmt.Fprintf(os.Stderr, "~ %s: return with error: %v\n", command, err) + fmt.Fprintf(os.Stderr, "~ %s: error: %v\n", command, err) } os.Exit(1) }