Commit `8b661d9f36`

8b661d9f36381ee432ece5e77a17d5ae6357d327

parent: d9bd61cc74

Unsigned

cmc <hello@cleberg.net> · 2026-07-20 20:31 UTC

fix: make disabled targets and forced queue processing visible

Closes #8, closes #9.

enqueue(events:) filtered to enabled targets before writing any
DeliveryRecord, so events routed to a disabled integration disappeared
with nothing in the Delivery Log. Disabled targets now record a .skipped
entry with a reason, matching how filter mismatches are already surfaced.

sendTest bypassed the isEnabled check entirely, so a test event
delivered against a target that silently dropped every real event —
exactly the wrong signal when someone is verifying their setup. It now
skips with the same reason.

processQueueNow only restarted the processing task; it never moved
nextAttemptAt, so an item in retry backoff stayed undue and the fresh
task went straight back to sleep. Backoff reaches an hour, so the button
appeared inert for the one case it exists to handle. It now pulls every
queued item forward, and reports when the queue is empty instead of
returning silently.

Layout: unified · split

DomainDig/IntegrationService.swift +52 −6

	@@ -100,9 +100,22 @@ final class IntegrationService {
100		100
101	func enqueue(events: [MonitoringEvent]) {	101	func enqueue(events: [MonitoringEvent]) {
102	guard !events.isEmpty else { return }	102	guard !events.isEmpty else { return }
103	let eligibleTargets = targets.filter(\.isEnabled)
104	for event in events {	103	for event in events {
105	for target in eligibleTargets {	104	for target in targets {
		105	guard target.isEnabled else {
		106	appendRecord(
		107	DeliveryRecord(
		108	integrationID: target.id,
		109	eventID: event.id,
		110	status: .skipped,
		111	destination: destinationLabel(for: target),
		112	summary: event.summary,
		113	failureReason: Self.disabledTargetReason
		114	)
		115	)
		116	continue
		117	}
		118
106	if let reason = filterMismatchReason(for: event, target: target) {	119	if let reason = filterMismatchReason(for: event, target: target) {
107	appendRecord(	120	appendRecord(
108	DeliveryRecord(	121	DeliveryRecord(
	@@ -150,7 +163,7 @@ final class IntegrationService {
150	}	163	}
151		164
152	func sendTest(for targetID: UUID) {	165	func sendTest(for targetID: UUID) {
153	guard targets.contains(where: { $0.id == targetID }) else { return }	166	guard let target = targets.first(where: { $0.id == targetID }) else { return }
154	let event = MonitoringEvent(	167	let event = MonitoringEvent(
155	type: .test,	168	type: .test,
156	severity: .info,	169	severity: .info,
	@@ -161,13 +174,31 @@ final class IntegrationService {
161	"environment": "local-first"	174	"environment": "local-first"
162	]	175	]
163	)	176	)
164	queue.append(QueuedDelivery(integrationID: targetID, event: event))	177
		178	// Real events skip a disabled target, so a test event must too —
		179	// otherwise a test succeeds against a target that silently drops
		180	// everything monitoring sends it.
		181	guard target.isEnabled else {
		182	appendRecord(
		183	DeliveryRecord(
		184	integrationID: target.id,
		185	eventID: event.id,
		186	status: .skipped,
		187	destination: destinationLabel(for: target),
		188	summary: event.summary,
		189	failureReason: Self.disabledTargetReason
		190	)
		191	)
		192	return
		193	}
		194
		195	queue.append(QueuedDelivery(integrationID: target.id, event: event))
165	appendRecord(	196	appendRecord(
166	DeliveryRecord(	197	DeliveryRecord(
167	integrationID: targetID,	198	integrationID: target.id,
168	eventID: event.id,	199	eventID: event.id,
169	status: .pending,	200	status: .pending,
170	destination: targets.first(where: { $0.id == targetID }).map(destinationLabel(for:)) ?? "Unknown",	201	destination: destinationLabel(for: target),
171	summary: event.summary	202	summary: event.summary
172	)	203	)
173	)	204	)
	@@ -175,7 +206,20 @@ final class IntegrationService {
175	scheduleProcessing()	206	scheduleProcessing()
176	}	207	}
177		208
		209	/// Restarting the processing task alone leaves any item still in retry
		210	/// backoff undue, so the loop would skip it and sleep again. Pulling every
		211	/// queued item forward is what makes this button mean "now".
178	func processQueueNow() {	212	func processQueueNow() {
		213	guard !queue.isEmpty else {
		214	statusMessage = "No deliveries are waiting."
		215	return
		216	}
		217
		218	let now = Date()
		219	for index in queue.indices {
		220	queue[index].nextAttemptAt = now
		221	}
		222	persistQueue()
179	scheduleProcessing(force: true)	223	scheduleProcessing(force: true)
180	}	224	}
181		225
	@@ -427,6 +471,8 @@ final class IntegrationService {
427	URL(string: string)?.host ?? "Configured"	471	URL(string: string)?.host ?? "Configured"
428	}	472	}
429		473
		474	private static let disabledTargetReason = "This integration is disabled."
		475
430	private static func secretReference(for integrationID: UUID, suffix: String) -> String {	476	private static func secretReference(for integrationID: UUID, suffix: String) -> String {
431	"integration.\(integrationID.uuidString).\(suffix)"	477	"integration.\(integrationID.uuidString).\(suffix)"
432	}	478	}

Commit 8b661d9f36

Commit `8b661d9f36`