From 620d5ac834735411b5297b331b1aaff549c2cd72 Mon Sep 17 00:00:00 2001 From: xjasonlyu Date: Sun, 27 Mar 2022 14:19:36 +0800 Subject: [PATCH] Chore: put log in engine --- engine/engine.go | 14 +++++++++----- main.go | 14 ++++---------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/engine/engine.go b/engine/engine.go index 4d846b3..05711ae 100644 --- a/engine/engine.go +++ b/engine/engine.go @@ -17,13 +17,17 @@ import ( var _engine = &engine{} // Start starts the default engine up. -func Start() error { - return _engine.start() +func Start() { + if err := _engine.start(); err != nil { + log.Fatalf("[ENGINE] failed to start: %v", err) + } } // Stop shuts the default engine down. -func Stop() error { - return _engine.stop() +func Stop() { + if err := _engine.stop(); err != nil { + log.Fatalf("[ENGINE] failed to stop: %v", err) + } } // Insert loads *Key to the default engine. @@ -120,7 +124,7 @@ func (e *engine) applyStats() error { go func() { if err := stats.Start(addr.String(), e.Token); err != nil { - log.Warnf("[STATS] stats start error: %v", err) + log.Warnf("[STATS] failed to start: %v", err) } }() log.Infof("[STATS] serve at: http://%s", addr) diff --git a/main.go b/main.go index 2041c50..9fea848 100644 --- a/main.go +++ b/main.go @@ -49,23 +49,17 @@ func main() { if configFile != "" { data, err := os.ReadFile(configFile) if err != nil { - log.Fatalf("Failed to read config %s: %v", configFile, err) + log.Fatalf("Failed to read config file '%s': %v", configFile, err) } if err = yaml.Unmarshal(data, key); err != nil { - log.Fatalf("Failed to unmarshal config %s: %v", configFile, err) + log.Fatalf("Failed to unmarshal config file '%s': %v", configFile, err) } } engine.Insert(key) - assert := func(msg string, f func() error) { - if err := f(); err != nil { - log.Fatalf("Failed to %s: %v", msg, err) - } - } - - assert("start engine", engine.Start) - defer assert("stop engine", engine.Stop) + engine.Start() + defer engine.Stop() sigCh := make(chan os.Signal, 1) signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)