Break down findings from review #002 into dependency-ordered fix tasks: Critical/High: - fix/acme-contact-and-challenge (C1+C2): Add acme_contact field, wire to ACME, remove unused challenge_config, add validation rule 19 - fix/remove-health-and-hardcode-https (W5+W14+ADR-022): Remove /health from main listener, hardcode X-Forwarded-Proto to https - fix/config-reload-static-drift (C4): Use ArcSwap<StaticConfig> so reload diffs against last config, not startup config - fix/access-logging (W13): Wire up log_request! macro for every proxied request with client_ip, host, method, path, status, upstream, duration_ms Medium: - fix/graceful-shutdown (W1+W7): Join HTTPS tasks with timeout instead of abort, add shutdown signal to admin socket and eviction task - fix/connect-timeout (W4): Wire upstream_connect_timeout_secs to enforce separate connect timeout Low/Independent: - fix/token-bucket-nanosecond (W6): Use as_nanos() instead of as_millis() - fix/normalize-host-ipv6 (S3): Handle IPv6 bracket notation in normalize_host - fix/http-port-validation (S1): Validate http_port in range 0 or 1-65535 - fix/integration-test-toml (S10): Fix double-nested listeners.listeners.sites - fix/logging-test-global-subscriber (W9): Use try_init() to avoid test conflicts - fix/fragile-error-detection (W3): Add typed error matching or documented string match - fix/add-code-comments (C3,W8,W10,W11,S9): Document correct-but-non-obvious behaviors - fix/request-timeout-scope (S8): Document full-request timeout scope - fix/clean-dead-code (S4+S2): Remove dead_code annotations, add #[non_exhaustive] Review gate: - review/post-fix-review: Verify all fixes against architecture spec
2.8 KiB
id, name, status, depends_on, scope, risk, impact, level, review_findings
| id | name | status | depends_on | scope | risk | impact | level | review_findings | |
|---|---|---|---|---|---|---|---|---|---|
| fix/config-reload-static-drift | Fix ConfigReloadHandle static config drift causing stale diff warnings | pending | narrow | medium | component | implementation |
|
Description
Fix the ConfigReloadHandle::reload() method which computes a diff of static config fields but never updates the stored StaticConfig. This means every reload compares against the original static config (from process start), not the last-reloaded one, causing repeated "static config fields changed" warnings for the same fields on every reload.
The architecture spec in config.md explicitly states: "The ConfigReloadHandle must track the last-known StaticConfig so that it can correctly detect changes on subsequent reloads. After each successful reload, the stored StaticConfig is updated with the new value."
Changes Required
src/config/dynamic_config.rs:
- Change
ConfigReloadHandle.static_configfromStaticConfigtoArcSwap<StaticConfig> - Update
ConfigReloadHandle::new()to wrap the static config inArcSwap - In
reload(), after computing the diff, store the new static config:self.static_config.store(Arc::new(new_static)) - Add
pub fn static_config(&self) -> Arc<StaticConfig>accessor if needed by other code - Update
diff_static_configto work with references (it already does — just need to useself.static_config.load()instead of&self.static_config)
Tests:
- Update
ConfigReloadHandletests to verify that a second reload only reports changes since the first reload, not changes since startup - Verify that the
static_config_diff_detects_changestest still works withArcSwap<StaticConfig>
Implementation Note
The ArcSwap<StaticConfig> approach is already used for DynamicConfig in the same struct. The pattern is well-established in the codebase. ArcSwap provides lock-free reads (important since reloads are rare but reads could be concurrent), and Arc<StaticConfig> is cheap to clone for comparison purposes.
Acceptance Criteria
ConfigReloadHandle.static_configisArcSwap<StaticConfig>(not plainStaticConfig)- After a successful reload,
self.static_configis updated with the new value - A second reload with no further static config changes reports an empty diff
- A second reload with different static config changes reports only the new changes
- Existing reload tests pass
cargo clippypasses with no warnings
References
- docs/architecture/config.md — Static config changes during reload, ArcSwap pattern
- docs/reviews/002-implementation-review.md — C4 finding
- src/config/dynamic_config.rs — ConfigReloadHandle implementation
Notes
To be filled by implementation agent
Summary
To be filled on completion