dohertj2/ScadaBridge
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(dcl): route native alarm subscribe/unsubscribe through DataConnectionManagerActor

Browse Source 
The NativeAlarmActor sends SubscribeAlarmsRequest to the DCL manager, but the
manager only routed tag/write/browse messages to the per-connection
DataConnectionActor — alarm subscribe/unsubscribe were unhandled and dead-lettered,
so native alarms never subscribed at runtime. Caught by live T28 deployment.
Mirrors the existing HandleRoute forwarding.
This commit is contained in:
Joseph Doherty
2026-05-31 03:25:28 -04:00
parent f4ae44aacc
commit add7210d9e
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ZB.MOM.WW.ScadaBridge.DataConnectionLayer/Actors/DataConnectionManagerActor.cs
+27
View File
@@ -43,6 +43,8 @@ public class DataConnectionManagerActor : ReceiveActor
Receive<CreateConnectionCommand>(HandleCreateConnection);
Receive<SubscribeTagsRequest>(HandleRoute);
Receive<UnsubscribeTagsRequest>(HandleRoute);
Receive<SubscribeAlarmsRequest>(HandleRouteAlarms);
Receive<UnsubscribeAlarmsRequest>(HandleRouteAlarms);
Receive<WriteTagRequest>(HandleRouteWrite);
Receive<RemoveConnectionCommand>(HandleRemoveConnection);
Receive<GetAllHealthReports>(HandleGetAllHealthReports);
@@ -101,6 +103,31 @@ public class DataConnectionManagerActor : ReceiveActor
_log.Warning("No connection actor for {0} during unsubscribe", request.ConnectionName);
}
/// <summary>
/// Routes a native alarm subscribe to the <see cref="DataConnectionActor"/> that owns
/// the named connection (the NativeAlarmActor sends here, not to the child directly).
/// </summary>
private void HandleRouteAlarms(SubscribeAlarmsRequest request)
{
if (_connectionActors.TryGetValue(request.ConnectionName, out var actor))
actor.Forward(request);
else
{
_log.Warning("No connection actor for {0} during alarm subscribe", request.ConnectionName);
Sender.Tell(new SubscribeAlarmsResponse(
request.CorrelationId, request.InstanceUniqueName, false,
$"Unknown connection: {request.ConnectionName}", DateTimeOffset.UtcNow));
}
}
private void HandleRouteAlarms(UnsubscribeAlarmsRequest request)
{
if (_connectionActors.TryGetValue(request.ConnectionName, out var actor))
actor.Forward(request);
else
_log.Warning("No connection actor for {0} during alarm unsubscribe", request.ConnectionName);
}
private void HandleRouteWrite(WriteTagRequest request)
{
if (_connectionActors.TryGetValue(request.ConnectionName, out var actor))