Skip to content

Commit 148764b

Browse files
committed
Add explicit skip messages on version mismatch
1 parent b1d2f81 commit 148764b

2 files changed

Lines changed: 14 additions & 0 deletions

File tree

rolling-shutter/keyperimpl/shutterservice/eventtriggerregisteredprocessor.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,13 @@ func (p *EventTriggerRegisteredEventProcessor) ProcessEvents(ctx context.Context
8585
}
8686

8787
triggerDefinition := EventTriggerDefinition{}
88+
if len(registryEvent.TriggerDefinition) > 0 &&
89+
registryEvent.TriggerDefinition[0] != Version {
90+
evLog.Log().Int64("version", int64(
91+
registryEvent.TriggerDefinition[0])).Msg(
92+
"skipping trigger definition with outdated version")
93+
continue
94+
}
8895
err := triggerDefinition.UnmarshalBytes(registryEvent.TriggerDefinition)
8996
if err != nil {
9097
evLog.Info().Err(err).Msg("skipping invalid trigger definition")

rolling-shutter/keyperimpl/shutterservice/triggerprocessor.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,13 @@ func (tp *TriggerProcessor) FetchEvents(ctx context.Context, start, end uint64)
6464

6565
trigger := EventTriggerDefinition{}
6666
err := trigger.UnmarshalBytes(triggerRegisteredEvent.Definition)
67+
if len(triggerRegisteredEvent.Definition) > 0 &&
68+
triggerRegisteredEvent.Definition[0] != Version {
69+
triggerLog.Log().Int64("version", int64(
70+
triggerRegisteredEvent.Definition[0])).Msg(
71+
"ignoring trigger definition with outdated version in database")
72+
continue
73+
}
6774
if err != nil {
6875
// This is not supposed to happen as only valid triggers are inserted into the database.
6976
triggerLog.Error().Err(err).Msg("ignoring invalid trigger definition in database")

0 commit comments

Comments
 (0)