fix(plc4go/cbus): handle pre registered consumers

apache · Jun 15, 2023 · c12edf3 · c12edf3
1 parent 4b47943
commit c12edf3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/plc4go/internal/ads/Subscriber.go b/plc4go/internal/ads/Subscriber.go
@@ -74,12 +74,14 @@ func (m *Connection) Subscribe(ctx context.Context, subscriptionRequest apiModel
 		subscriptionType := defaultSubscriptionRequest.GetType(tagName)
 		interval := defaultSubscriptionRequest.GetInterval(tagName)
 		preRegisteredConsumers := defaultSubscriptionRequest.GetPreRegisteredConsumers(tagName)
-		subSubscriptionRequests[tagName] = spiModel.NewDefaultPlcSubscriptionRequest(m,
+		subSubscriptionRequests[tagName] = spiModel.NewDefaultPlcSubscriptionRequest(
+			m,
 			[]string{tagName},
 			map[string]apiModel.PlcTag{tagName: directTag},
 			map[string]spiModel.SubscriptionType{tagName: subscriptionType},
 			map[string]time.Duration{tagName: interval},
-			map[string][]apiModel.PlcSubscriptionEventConsumer{tagName: preRegisteredConsumers})
+			map[string][]apiModel.PlcSubscriptionEventConsumer{tagName: preRegisteredConsumers},
+		)
 	}
 
 	// If this is a single item request, we can take a shortcut.

diff --git a/plc4go/internal/cbus/Subscriber.go b/plc4go/internal/cbus/Subscriber.go
@@ -74,7 +74,18 @@ func (s *Subscriber) Subscribe(_ context.Context, subscriptionRequest apiModel.P
 		subscriptionValues := make(map[string]apiModel.PlcSubscriptionHandle)
 		for _, tagName := range internalPlcSubscriptionRequest.GetTagNames() {
 			responseCodes[tagName] = apiModel.PlcResponseCode_OK
-			subscriptionValues[tagName] = NewSubscriptionHandle(s, tagName, internalPlcSubscriptionRequest.GetTag(tagName), internalPlcSubscriptionRequest.GetType(tagName), internalPlcSubscriptionRequest.GetInterval(tagName))
+			handle := NewSubscriptionHandle(
+				s,
+				tagName,
+				internalPlcSubscriptionRequest.GetTag(tagName),
+				internalPlcSubscriptionRequest.GetType(tagName),
+				internalPlcSubscriptionRequest.GetInterval(tagName),
+			)
+			preRegisteredConsumers := internalPlcSubscriptionRequest.GetPreRegisteredConsumers(tagName)
+			for _, consumer := range preRegisteredConsumers {
+				_ = handle.Register(consumer)
+			}
+			subscriptionValues[tagName] = handle
 		}
 
 		result <- spiModel.NewDefaultPlcSubscriptionRequestResult(