TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 15:07:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(handler): handle trigger err correctly (#7205)

Browse Source 
(cherry picked from commit 3c5fc31372)
This commit is contained in:
Silvan
2024-01-11 18:55:50 +01:00
committed by Livio Spring
parent 50aacb8127
commit a7ac15ff60
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/eventstore/handler/v2/handler.go
View File

@@ -145,6 +145,7 @@ func (h *Handler) schedule(ctx context.Context) {
_, err = h.Trigger(instanceCtx) _, err = h.Trigger(instanceCtx)
instanceFailed = instanceFailed || err != nil instanceFailed = instanceFailed || err != nil
h.log().WithField("instance", instance).OnError(err).Info("scheduled trigger failed") h.log().WithField("instance", instance).OnError(err).Info("scheduled trigger failed")
time.Sleep(h.retryFailedAfter)
// retry if trigger failed // retry if trigger failed
for ; err != nil; _, err = h.Trigger(instanceCtx) { for ; err != nil; _, err = h.Trigger(instanceCtx) {
time.Sleep(h.retryFailedAfter) time.Sleep(h.retryFailedAfter)
@@ -336,7 +337,10 @@ func (h *Handler) processEvents(ctx context.Context, config *triggerConfig) (add
h.log().OnError(rollbackErr).Debug("unable to rollback tx") h.log().OnError(rollbackErr).Debug("unable to rollback tx")
return return
} }
err = tx.Commit() commitErr := tx.Commit()
if err == nil {
err = commitErr
}
}() }()
currentState, err := h.currentState(ctx, tx, config) currentState, err := h.currentState(ctx, tx, config)