From 34304119caf84df4b1b50de66cd5763eb921a792 Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Sun, 30 Jun 2024 02:52:48 +0900 Subject: [PATCH] rpcfetch: retry nonce errors Nonce errors shouldn't be fatal, sometimes weird stuff happens and retrying could fix it. Signed-off-by: Ophestra Umiker --- fetch/apply.go | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fetch/apply.go b/fetch/apply.go index 1a9f4c4..50e7096 100644 --- a/fetch/apply.go +++ b/fetch/apply.go @@ -105,7 +105,7 @@ func apply() { func retry(act *rpcfetch.Activity, s *applyState) (string, error) { try: nonce, err := d.SetActivity(act) - if errors.Is(err, rpcfetch.ErrAgain) { + if errors.Is(err, rpcfetch.ErrAgain) || errors.Is(err, rpcfetch.ErrNonce) { failureState(false) log.Println("retrying in 5 seconds...") time.Sleep(5 * time.Second) diff --git a/go.sum b/go.sum index b1617cc..5503a15 100644 --- a/go.sum +++ b/go.sum @@ -43,6 +43,8 @@ fyne.io/systray v1.10.1-0.20231115130155-104f5ef7839e h1:Hvs+kW2VwCzNToF3FmnIAzm fyne.io/systray v1.10.1-0.20231115130155-104f5ef7839e/go.mod h1:oM2AQqGJ1AMo4nNqZFYU8xYygSBZkW2hmdJ7n4yjedE= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=