close chan with status channel lock

Author: sechmann

Diff for: internal/device-agent/deviceagent.go

@@ -19,13 +19,14 @@ import (
 
 type DeviceAgentServer struct {
 	pb.UnimplementedDeviceAgentServer
-	lock           sync.RWMutex
-	statusChannels map[uuid.UUID]chan *pb.AgentStatus
-	Config         *config.Config
-	notifier       notify.Notifier
-	rc             runtimeconfig.RuntimeConfig
-	log            *logrus.Entry
-	sendEvent      func(state.EventWithSpan)
+	Config    *config.Config
+	notifier  notify.Notifier
+	rc        runtimeconfig.RuntimeConfig
+	log       *logrus.Entry
+	sendEvent func(state.EventWithSpan)
+
+	statusChannelsLock sync.RWMutex
+	statusChannels     map[uuid.UUID]chan *pb.AgentStatus
 
 	AgentStatus     *pb.AgentStatus
 	agentStatusLock sync.RWMutex
@@ -51,20 +52,20 @@ func (das *DeviceAgentServer) Status(request *pb.AgentStatusRequest, statusServe
 	agentStatusChan <- das.AgentStatus
 	das.agentStatusLock.RUnlock()
 
-	das.lock.Lock()
+	das.statusChannelsLock.Lock()
 	das.statusChannels[id] = agentStatusChan
-	das.lock.Unlock()
+	das.statusChannelsLock.Unlock()
 
 	defer func() {
 		das.log.Debugf("grpc: client connection with device helper closed")
 		if !request.GetKeepConnectionOnComplete() {
 			das.log.Debugf("grpc: keepalive not requested, tearing down connections...")
 			das.sendEvent(state.SpanEvent(statusServer.Context(), state.EventDisconnect))
 		}
+		das.statusChannelsLock.Lock()
 		close(agentStatusChan)
-		das.lock.Lock()
 		delete(das.statusChannels, id)
-		das.lock.Unlock()
+		das.statusChannelsLock.Unlock()
 	}()
 
 	for {
@@ -89,15 +90,15 @@ func (das *DeviceAgentServer) UpdateAgentStatus(status *pb.AgentStatus) {
 	das.AgentStatus = status
 	das.agentStatusLock.Unlock()
 
-	das.lock.RLock()
+	das.statusChannelsLock.RLock()
 	for _, c := range das.statusChannels {
 		select {
 		case c <- status:
 		default:
 			das.log.Errorf("BUG: update agent status: channel is full")
 		}
 	}
-	das.lock.RUnlock()
+	das.statusChannelsLock.RUnlock()
 }
 
 func (das *DeviceAgentServer) SetAgentConfiguration(ctx context.Context, req *pb.SetAgentConfigurationRequest) (*pb.SetAgentConfigurationResponse, error) {