Completes local-dev-master-slave-setup: dual-instance frontend tooling, module-capability gating, and master/slave protocol self-healing fixes
Frontend (Unit 2 completion): dual dev-server tooling (pnpm dev:slave, pnpm dev:all), per-instance browser tab titles, and a backend capability check (SystemController + useSystemCapabilities + ModuleGuard) so a Master-only page is hidden on a slave instance instead of assuming every backend has every module. Master/slave protocol fixes surfaced by actually running master and slave side by side locally: - Deactivating a CMS instance (Inactive) now releases the slave's master gate instead of leaving it stuck on its last pushed status. - The periodic integrity check now also re-pushes status to every reachable slave (previously URL-verification only) and runs once immediately on startup. - Added the originally-specified (but never implemented) slave-pull path: a slave now periodically polls its own status from the master (GET /api/v1/SlaveStatus) and fails open to Available if the master is unreachable for too long, complementing the existing push. - The slave's own Settings page can no longer "successfully" change local availability while the master controls it; it's now locked with an explanatory banner and the backend rejects the write with 409 instead of silently no-op'ing it. - CMS instance status badges now match the dashboard's color/icon styling instead of a plain grey badge. Also corrected the master-cms-module design docs to match this as-built behavior, and flagged (without a full rewrite) a larger, pre-existing divergence between its inception-stage application design and what construction actually built. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -24,8 +24,11 @@ public class PersistentAvailabilityServiceTests
|
||||
|
||||
var availabilityOptions = Substitute.For<IOptions<AvailabilityOptions>>();
|
||||
availabilityOptions.Value.Returns(new AvailabilityOptions { CircuitBreakerSeconds = 30 });
|
||||
|
||||
_service = new PersistentAvailabilityService(_context, availabilityOptions);
|
||||
|
||||
var masterAvailabilityService = Substitute.For<IMasterAvailabilityService>();
|
||||
masterAvailabilityService.GetMasterStatus().Returns(new MasterGateStatus(true, null));
|
||||
|
||||
_service = new PersistentAvailabilityService(_context, availabilityOptions, masterAvailabilityService);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -99,6 +102,24 @@ public class PersistentAvailabilityServiceTests
|
||||
details.Status.Should().Be(AvailabilityStatus.Available); // Fallback
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetStatusDetailsAsync_ShouldReturnNotAvailable_WhenMasterGateDisabled()
|
||||
{
|
||||
var availabilityOptions = Substitute.For<IOptions<AvailabilityOptions>>();
|
||||
availabilityOptions.Value.Returns(new AvailabilityOptions { CircuitBreakerSeconds = 30 });
|
||||
|
||||
var masterAvailabilityService = Substitute.For<IMasterAvailabilityService>();
|
||||
masterAvailabilityService.GetMasterStatus().Returns(new MasterGateStatus(false, "Master heeft deze slave uitgeschakeld"));
|
||||
|
||||
var service = new PersistentAvailabilityService(_context, availabilityOptions, masterAvailabilityService);
|
||||
|
||||
var details = await service.GetStatusDetailsAsync();
|
||||
|
||||
details.Status.Should().Be(AvailabilityStatus.NotAvailable);
|
||||
details.Message.Should().Be("Master heeft deze slave uitgeschakeld");
|
||||
details.IsMasterControlled.Should().BeTrue();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateStatusAsync_UpdatesExistingRecord_WhenCalledTwice()
|
||||
{
|
||||
@@ -112,4 +133,21 @@ public class PersistentAvailabilityServiceTests
|
||||
dbState.Status.Should().Be(AvailabilityStatus.Available);
|
||||
dbState.UpdatedBy.Should().Be("Admin2");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateStatusAsync_Throws_WhenMasterControlsTheGate()
|
||||
{
|
||||
var availabilityOptions = Substitute.For<IOptions<AvailabilityOptions>>();
|
||||
availabilityOptions.Value.Returns(new AvailabilityOptions { CircuitBreakerSeconds = 30 });
|
||||
|
||||
var masterAvailabilityService = Substitute.For<IMasterAvailabilityService>();
|
||||
masterAvailabilityService.GetMasterStatus().Returns(new MasterGateStatus(false, "Uitgeschakeld door master"));
|
||||
|
||||
var service = new PersistentAvailabilityService(_context, availabilityOptions, masterAvailabilityService);
|
||||
|
||||
var act = async () => await service.UpdateStatusAsync(AvailabilityStatus.Available, null, "Admin");
|
||||
|
||||
await act.Should().ThrowAsync<MasterControlledAvailabilityException>();
|
||||
(await _context.AvailabilityStates.FirstOrDefaultAsync()).Should().BeNull();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user