Merge pull request #6956 from urbit/pkova/dead-flow-fix

ames: fix bug in dead flow consolidation toggle
This commit is contained in:
Pyry Kovanen 2024-04-12 13:20:31 +03:00 committed by GitHub
commit 68cdcebd96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -2306,11 +2306,12 @@
%- (slog leaf+"ames: turning off dead flow consolidation" ~) %- (slog leaf+"ames: turning off dead flow consolidation" ~)
=. event-core =. event-core
(emit:event-core duct.u.ded %pass wire.u.ded %b %rest date.u.ded) (emit:event-core duct.u.ded %pass wire.u.ded %b %rest date.u.ded)
=. flow.dead.ames-state.event-core [%flow ~]
(wake-dead-flows:event-core ~) (wake-dead-flows:event-core ~)
:: ::
%- (slog leaf+"ames: switching to dead flow consolidation" ~) %- (slog leaf+"ames: switching to dead flow consolidation" ~)
=; cor=event-core =; cor=event-core
set-dead-flow-timer:(wake-dead-flows:cor ~) set-dead-flow-timer:cor
%- ~(rep by peers.ames-state:event-core) %- ~(rep by peers.ames-state:event-core)
|= [[=ship =ship-state] core=_event-core] |= [[=ship =ship-state] core=_event-core]
^+ event-core ^+ event-core
@ -2854,7 +2855,7 @@
:: ames-state changes :: ames-state changes
:: ::
++ wake-dead-flows ++ wake-dead-flows
|= [error=(unit tang)] |= error=(unit tang)
^+ event-core ^+ event-core
%- ~(rep by peers.ames-state:event-core) %- ~(rep by peers.ames-state:event-core)
|= [[=ship =ship-state] core=_event-core] |= [[=ship =ship-state] core=_event-core]