From 6c1b09bbeb1a7268a0d590e0a20ab2d34b395c8f Mon Sep 17 00:00:00 2001 From: Ben Morrison Date: Thu, 6 Jun 2019 18:16:29 -0400 Subject: cleaned up error handling --- svc/init.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'svc/init.go') diff --git a/svc/init.go b/svc/init.go index aed3449..8e9bb20 100644 --- a/svc/init.go +++ b/svc/init.go @@ -40,6 +40,18 @@ var remoteRegistries = &RemoteRegistries{} var staticCache = &staticAssets{} +func errFatal(context string, err error) { + if err != nil { + log.Fatalf(context+"%v\n", err.Error()) + } +} + +func errLog(context string, err error) { + if err != nil { + log.Printf(context+"%v\n", err.Error()) + } +} + // I'm not using init() because it runs // even during testing and was causing // problems. @@ -92,10 +104,8 @@ func watchForInterrupt() { case *dbLevel: lvl := dbType - if err := lvl.db.Close(); err != nil { - log.Printf("%v\n", err.Error()) - } - + err := lvl.db.Close() + errLog("", err) } if !confObj.StdoutLogging { -- cgit 1.4.1-2-gfad0