Merge pull request #11 from voi-go/make-must-init-smooter

Make MustInit smoother
voi-oss · Dec 4, 2019 · 7cf64c0 · 7cf64c0
2 parents 6a092dc + 252bd34
commit 7cf64c0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/svc.go b/svc.go
@@ -141,13 +141,15 @@ func (s *SVC) Shutdown() {
 }
 
 // MustInit is a convenience function to check for and halt on errors.
-func MustInit(s *SVC, err error) {
+func MustInit(s *SVC, err error) *SVC {
 	if err != nil {
 		if s == nil || s.logger == nil {
 			panic(err)
 		}
 		s.logger.Fatal("Service initialization failed", zap.Error(err), zap.Stack("stacktrace"))
+		return nil
 	}
+	return s
 }
 
 // Logger returns the service's logger. Logger might be nil if New() fails.