Merge remote-tracking branch 'upstream/dev' into feat/mdt

api/api.go

@@ -24,6 +24,9 @@ type ServiceInterface interface {
 	// shutdown the service
 	Shutdown()
 
+	// return if the service is running
+	IsRunning() bool
+
 	// add a use case to the service
 	AddUseCase(useCase UseCaseInterface)
 

service/service.go

@@ -42,9 +42,11 @@ type Service struct {
 	// defines wether a user interaction to accept pairing is possible
 	isPairingPossible bool
 
-	startOnce sync.Once
+	// return if the service is running
+	isRunning bool
 
-	mux sync.Mutex
+	mux        sync.Mutex
+	muxRunning sync.Mutex
 }
 
 // creates a new EEBUS service
@@ -153,15 +155,41 @@ func (s *Service) Setup() error {
 
 // Starts the service
 func (s *Service) Start() {
-	s.startOnce.Do(func() {
-		s.connectionsHub.Start()
-	})
+	s.muxRunning.Lock()
+	defer s.muxRunning.Unlock()
+
+	// make sure we do not start twice while the service is already running
+	if s.isRunning {
+		return
+	}
+
+	s.connectionsHub.Start()
+
+	s.isRunning = true
 }
 
 // Shutdown all services and stop the server.
 func (s *Service) Shutdown() {
+	s.muxRunning.Lock()
+	defer s.muxRunning.Unlock()
+
+	// if the service is not running, we do not need to shut it down
+	if !s.isRunning {
+		return
+	}
+
 	// Shut down all running connections
 	s.connectionsHub.Shutdown()
+
+	s.isRunning = false
+}
+
+// return if the service is running
+func (s *Service) IsRunning() bool {
+	s.muxRunning.Lock()
+	defer s.muxRunning.Unlock()
+
+	return s.isRunning
 }
 
 // add a use case to the service

service/service_test.go

@@ -171,12 +171,21 @@ func (s *ServiceSuite) Test_Setup() {
 	assert.Equal(s.T(), "d:_n:vendor_model-serial", string(*address))
 
 	s.sut.connectionsHub = s.conHub
-	s.conHub.EXPECT().Start()
+	s.conHub.EXPECT().Start().Once()
 	s.sut.Start()
 
 	time.Sleep(time.Millisecond * 200)
 
-	s.conHub.EXPECT().Shutdown()
+	isRunning := s.sut.IsRunning()
+	assert.True(s.T(), isRunning)
+
+	// nothing should happen
+	s.sut.Start()
+
+	s.conHub.EXPECT().Shutdown().Once()
+	s.sut.Shutdown()
+
+	// nothing should happen
 	s.sut.Shutdown()
 
 	device := s.sut.LocalDevice()