fix(test): drop removed logger arg from GalaxyRepositoryGrpcService test call sites; docs: STA phrasing
Remove the trailing NullLogger<GalaxyRepositoryGrpcService>.Instance argument
from all four CreateService/inline constructions in GalaxyRepositoryGrpcServiceTests
and GalaxyFilterInputSafetyTests, matching the now-4-param constructor after the
dead logger parameter was removed in 0032d2d. Also drop the now-unused
Microsoft.Extensions.Logging.Abstractions using from both files.
Rephrase the §5 STA blurb in docs/AlarmClientDiscovery.md: GatewayAlarmMonitor
routes polling *through* the worker's StaRuntime (which owns the STA pump) rather
than owning the pump itself.
This commit is contained in:
@@ -770,9 +770,8 @@ on cross-apartment marshaling unless the host STA pumps Win32
|
|||||||
messages. The smoke test sidesteps this by setting
|
messages. The smoke test sidesteps this by setting
|
||||||
`pollIntervalMilliseconds=0` (Timer disabled) and driving `PollOnce`
|
`pollIntervalMilliseconds=0` (Timer disabled) and driving `PollOnce`
|
||||||
manually from the test's STA. Production alarm polling was wired up
|
manually from the test's STA. Production alarm polling was wired up
|
||||||
through the worker's `StaRuntime` via `GatewayAlarmMonitor`, which
|
through `GatewayAlarmMonitor`, which routes polling through the
|
||||||
owns the STA pump and drives alarm subscriptions through the worker
|
worker's `StaRuntime` (the STA pump owner) via the worker IPC path. This item is resolved; the wnwrap consumer's `PollOnce`
|
||||||
IPC path. This item is resolved; the wnwrap consumer's `PollOnce`
|
|
||||||
is no longer invoked directly in production.
|
is no longer invoked directly in production.
|
||||||
|
|
||||||
### Capture summary
|
### Capture summary
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using Grpc.Core;
|
using Grpc.Core;
|
||||||
using Microsoft.Extensions.Logging.Abstractions;
|
|
||||||
using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
|
using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
|
||||||
using ZB.MOM.WW.MxGateway.Server.Dashboard;
|
using ZB.MOM.WW.MxGateway.Server.Dashboard;
|
||||||
using ZB.MOM.WW.MxGateway.Server.Galaxy;
|
using ZB.MOM.WW.MxGateway.Server.Galaxy;
|
||||||
@@ -266,8 +265,7 @@ public sealed class GalaxyFilterInputSafetyTests
|
|||||||
new ZB.MOM.WW.MxGateway.Server.Galaxy.GalaxyRepository(options),
|
new ZB.MOM.WW.MxGateway.Server.Galaxy.GalaxyRepository(options),
|
||||||
new StubGalaxyHierarchyCache(entry),
|
new StubGalaxyHierarchyCache(entry),
|
||||||
new GalaxyDeployNotifier(),
|
new GalaxyDeployNotifier(),
|
||||||
new GatewayRequestIdentityAccessor(),
|
new GatewayRequestIdentityAccessor());
|
||||||
NullLogger<GalaxyRepositoryGrpcService>.Instance);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static GalaxyHierarchyCacheEntry CreateEntry(IReadOnlyList<GalaxyObject> objects)
|
private static GalaxyHierarchyCacheEntry CreateEntry(IReadOnlyList<GalaxyObject> objects)
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using Grpc.Core;
|
using Grpc.Core;
|
||||||
using Microsoft.Extensions.Logging.Abstractions;
|
|
||||||
using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
|
using ZB.MOM.WW.MxGateway.Contracts.Proto.Galaxy;
|
||||||
using ZB.MOM.WW.MxGateway.Server.Dashboard;
|
using ZB.MOM.WW.MxGateway.Server.Dashboard;
|
||||||
using ZB.MOM.WW.MxGateway.Server.Galaxy;
|
using ZB.MOM.WW.MxGateway.Server.Galaxy;
|
||||||
@@ -217,8 +216,7 @@ public sealed class GalaxyRepositoryGrpcServiceTests
|
|||||||
new global::ZB.MOM.WW.MxGateway.Server.Galaxy.GalaxyRepository(options),
|
new global::ZB.MOM.WW.MxGateway.Server.Galaxy.GalaxyRepository(options),
|
||||||
new StubGalaxyHierarchyCache(entry),
|
new StubGalaxyHierarchyCache(entry),
|
||||||
new GalaxyDeployNotifier(),
|
new GalaxyDeployNotifier(),
|
||||||
new GatewayRequestIdentityAccessor(),
|
new GatewayRequestIdentityAccessor());
|
||||||
NullLogger<GalaxyRepositoryGrpcService>.Instance);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static GalaxyHierarchyCacheEntry CreateEntry(IReadOnlyList<GalaxyObject> objects)
|
private static GalaxyHierarchyCacheEntry CreateEntry(IReadOnlyList<GalaxyObject> objects)
|
||||||
@@ -366,8 +364,7 @@ public sealed class GalaxyRepositoryGrpcServiceTests
|
|||||||
new global::ZB.MOM.WW.MxGateway.Server.Galaxy.GalaxyRepository(options),
|
new global::ZB.MOM.WW.MxGateway.Server.Galaxy.GalaxyRepository(options),
|
||||||
new NeverLoadsHierarchyCache(),
|
new NeverLoadsHierarchyCache(),
|
||||||
new GalaxyDeployNotifier(),
|
new GalaxyDeployNotifier(),
|
||||||
new GatewayRequestIdentityAccessor(),
|
new GatewayRequestIdentityAccessor());
|
||||||
NullLogger<GalaxyRepositoryGrpcService>.Instance);
|
|
||||||
|
|
||||||
// No caller-supplied CT so WaitForCacheBootstrap exits via its 5s internal budget
|
// No caller-supplied CT so WaitForCacheBootstrap exits via its 5s internal budget
|
||||||
// (instead of re-throwing OperationCanceledException from the caller's CT). The
|
// (instead of re-throwing OperationCanceledException from the caller's CT). The
|
||||||
@@ -448,8 +445,7 @@ public sealed class GalaxyRepositoryGrpcServiceTests
|
|||||||
new global::ZB.MOM.WW.MxGateway.Server.Galaxy.GalaxyRepository(options),
|
new global::ZB.MOM.WW.MxGateway.Server.Galaxy.GalaxyRepository(options),
|
||||||
new StubGalaxyHierarchyCache(CreateEntry(CreateFilterObjects())),
|
new StubGalaxyHierarchyCache(CreateEntry(CreateFilterObjects())),
|
||||||
new GalaxyDeployNotifier(),
|
new GalaxyDeployNotifier(),
|
||||||
identityAccessor,
|
identityAccessor);
|
||||||
NullLogger<GalaxyRepositoryGrpcService>.Instance);
|
|
||||||
|
|
||||||
// Sanity: with no identity pushed, both Pump and Valve come back under Line3 (id=2).
|
// Sanity: with no identity pushed, both Pump and Valve come back under Line3 (id=2).
|
||||||
BrowseChildrenReply unconstrained = await service.BrowseChildren(
|
BrowseChildrenReply unconstrained = await service.BrowseChildren(
|
||||||
|
|||||||
Reference in New Issue
Block a user