Joseph Doherty
47b1fd422c
Adds the missing trigger that activates the worker's wnwrap consumer.
Without this, every session opened in OK state but the consumer never
started, so AcknowledgeAlarm/QueryActiveAlarms returned "alarm consumer
not configured" forever.
New AlarmsOptions config block (under MxGateway:Alarms):
- Enabled (default false): gates the auto-subscribe path so existing
deployments without alarm configuration are unaffected.
- SubscriptionExpression: explicit AVEVA expression like
\<machine>\Galaxy!<area>.
- DefaultArea: fallback used when SubscriptionExpression is empty;
composes \$(MachineName)\Galaxy!$(DefaultArea).
- RequireSubscribeOnOpen (default false): when true, an auto-subscribe
failure faults the session; when false, the failure is logged and
the session stays Ready (data subscriptions keep working, alarms
return "not subscribed" until the operator retries).
SessionManager.OpenSessionAsync gains a TryAutoSubscribeAlarmsAsync hook
that runs after MarkReady. Skips when alarms are disabled; otherwise
builds a SubscribeAlarmsCommand, invokes it on the session's worker
client, and either logs the resulting status or escalates per
RequireSubscribeOnOpen. SessionManagerException is the failure mode for
the strict path so callers in MxAccessGatewayService surface it as
session-open-failed.
Tests: 7 new unit tests cover the disabled lane, expression-driven
subscribe, DefaultArea fallback, success path, soft-failure (require
off), strict-failure (require on), and missing-config-strict-throw.
Server suite total: 295 pass / 0 fail. Solution builds clean.
End-to-end alarms-over-gateway path is now live (with config). Open a
session against a gateway with Alarms.Enabled=true + a valid
SubscriptionExpression; the worker's wnwrap consumer auto-subscribes;
QueryActiveAlarms streams snapshots; AcknowledgeAlarm acks by GUID.
Reference→GUID resolution (AlarmAckByName worker command) and the live
dev-rig smoke test remain follow-ups.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
46 lines
1.3 KiB
C#
46 lines
1.3 KiB
C#
namespace MxGateway.Server.Configuration;
|
|
|
|
public sealed class GatewayOptions
|
|
{
|
|
public const string SectionName = "MxGateway";
|
|
|
|
/// <summary>
|
|
/// Gets authentication configuration options.
|
|
/// </summary>
|
|
public AuthenticationOptions Authentication { get; init; } = new();
|
|
|
|
public LdapOptions Ldap { get; init; } = new();
|
|
|
|
/// <summary>
|
|
/// Gets worker process configuration options.
|
|
/// </summary>
|
|
public WorkerOptions Worker { get; init; } = new();
|
|
|
|
/// <summary>
|
|
/// Gets session management configuration options.
|
|
/// </summary>
|
|
public SessionOptions Sessions { get; init; } = new();
|
|
|
|
/// <summary>
|
|
/// Gets event stream configuration options.
|
|
/// </summary>
|
|
public EventOptions Events { get; init; } = new();
|
|
|
|
/// <summary>
|
|
/// Gets dashboard configuration options.
|
|
/// </summary>
|
|
public DashboardOptions Dashboard { get; init; } = new();
|
|
|
|
/// <summary>
|
|
/// Gets protocol configuration options.
|
|
/// </summary>
|
|
public ProtocolOptions Protocol { get; init; } = new();
|
|
|
|
/// <summary>
|
|
/// Gets alarm-subsystem configuration options. Drives the gateway's
|
|
/// auto-subscribe-on-session-open hook; default values preserve legacy
|
|
/// behaviour (alarms disabled).
|
|
/// </summary>
|
|
public AlarmsOptions Alarms { get; init; } = new();
|
|
}
|