From b473c12438438a4709708d5d4ecd403d81f11e03 Mon Sep 17 00:00:00 2001 From: Keuin Date: Thu, 8 Sep 2022 00:43:12 +0800 Subject: Bugfix: process won't quit when sending Ctrl-C. Print runtime information to logs in main() function. --- main.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 792df07..37083b9 100644 --- a/main.go +++ b/main.go @@ -7,6 +7,7 @@ import ( "fmt" "github.com/akamensky/argparse" "github.com/spf13/viper" + "log" "os" "os/signal" "sync" @@ -114,8 +115,11 @@ func main() { for _, task := range tasks { fmt.Println(task.String()) } - fmt.Println("========================") + fmt.Println("") + logger := log.Default() + + logger.Printf("Starting tasks...") chResult := make(chan recording.TaskResult) wg := sync.WaitGroup{} ctx, cancelTasks := context.WithCancel(context.Background()) @@ -131,18 +135,20 @@ func main() { chSigInt := make(chan os.Signal) signal.Notify(chSigInt, os.Interrupt) +loop: for { select { case <-chSigInt: - fmt.Println("Stopping...") + logger.Println("YABR is stopped.") cancelTasks() + break loop case result := <-chResult: err := result.Error if err != nil { - fmt.Printf("A task stopped with an error (room %v): %v\n", + logger.Printf("A task stopped with an error (room %v): %v\n", result.Task.RoomId, result.Error) } else { - fmt.Printf("Task stopped (room %v): %v\n", + logger.Printf("Task stopped (room %v): %v\n", result.Task.RoomId, result.Task.String()) } } -- cgit v1.2.3