From f1fde75567f08a585679b74dd7fee0e7dbf942cc Mon Sep 17 00:00:00 2001
From: Vasiliy Tolstov <v.tolstov@unistack.org>
Date: Mon, 7 Sep 2020 15:29:43 +0300
Subject: [PATCH] fix init

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
---
 service.go | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/service.go b/service.go
index 63fbad18..b4dc678b 100644
--- a/service.go
+++ b/service.go
@@ -63,37 +63,49 @@ func (s *service) Init(opts ...Option) {
 		); err != nil {
 			logger.Fatalf("[cmd] init failed: %v", err)
 		}
+	})
 
+	if s.opts.Registry != nil {
 		if err := s.opts.Registry.Init(); err != nil {
 			logger.Fatalf("[cmd] init failed: %v", err)
 		}
+	}
 
+	if s.opts.Broker != nil {
 		if err := s.opts.Broker.Init(); err != nil {
 			logger.Fatalf("[cmd] init failed: %v", err)
 		}
+	}
 
+	if s.opts.Transport != nil {
 		if err := s.opts.Transport.Init(); err != nil {
 			logger.Fatalf("[cmd] init failed: %v", err)
 		}
+	}
 
+	if s.opts.Store != nil {
 		if err := s.opts.Store.Init(); err != nil {
 			logger.Fatalf("[cmd] init failed: %v", err)
 		}
+	}
 
+	if s.opts.Server != nil {
 		if err := s.opts.Server.Init(); err != nil {
 			logger.Fatalf("[cmd] init failed: %v", err)
 		}
+	}
 
+	if s.opts.Client != nil {
 		if err := s.opts.Client.Init(); err != nil {
 			logger.Fatalf("[cmd] init failed: %v", err)
 		}
+	}
 
-		// execute the command
-		// TODO: do this in service.Run()
-		if err := s.opts.Cmd.Run(); err != nil {
-			logger.Fatalf("[cmd] run failed: %v", err)
-		}
-	})
+	// execute the command
+	// TODO: do this in service.Run()
+	if err := s.opts.Cmd.Run(); err != nil {
+		logger.Fatalf("[cmd] run failed: %v", err)
+	}
 }
 
 func (s *service) Options() Options {