From 6eb5a7af48d04adc5625cbc8355e2556db4b992f Mon Sep 17 00:00:00 2001
From: Keuin <keuinx@gmail.com>
Date: Fri, 7 Jul 2023 00:34:25 +0800
Subject: Refactor: move retry into single package.

---
 common/retry.go       | 47 -----------------------------------------------
 common/retry/retry.go | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 common/retry.go
 create mode 100644 common/retry/retry.go

(limited to 'common')

diff --git a/common/retry.go b/common/retry.go
deleted file mode 100644
index ff7b869..0000000
--- a/common/retry.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package common
-
-import (
-	"context"
-	"github.com/keuin/slbr/logging"
-	"time"
-)
-
-// AutoRetry retries the supplier automatically, with given time limit and interval.
-// If maximum retry time limit is reached and the supplier still fails,
-// the last error will be returned.
-// If logger is not nil, retry information will be printed to it.
-func AutoRetry[T any](
-	ctx context.Context,
-	supplier func() (T, error),
-	maxRetryTimes int,
-	retryInterval time.Duration,
-	logger *logging.Logger) (T, error) {
-	var err error
-	var ret T
-	for i := 0; i < maxRetryTimes+1; i++ {
-		ret, err = supplier()
-		if err != nil {
-			if logger != nil {
-				logger.Info("Try %v/%v (sleep %v): %v",
-					i, maxRetryTimes, retryInterval, err)
-			}
-			timer := time.NewTimer(retryInterval)
-			select {
-			case <-timer.C:
-				// time to have the next try
-				continue
-			case <-ctx.Done():
-				// context is cancelled
-				var zero T
-				return zero, ctx.Err()
-			}
-		}
-		// success
-		return ret, nil
-	}
-	if logger != nil {
-		logger.Error("Max retry times reached, but it still fails. Last error: %v", err)
-	}
-	var zero T
-	return zero, err
-}
diff --git a/common/retry/retry.go b/common/retry/retry.go
new file mode 100644
index 0000000..43e7d69
--- /dev/null
+++ b/common/retry/retry.go
@@ -0,0 +1,47 @@
+package retry
+
+import (
+	"context"
+	"github.com/keuin/slbr/logging"
+	"time"
+)
+
+// AutoRetry retries the supplier automatically, with given time limit and interval.
+// If maximum retry time limit is reached and the supplier still fails,
+// the last error will be returned.
+// If logger is not nil, retry information will be printed to it.
+func AutoRetry[T any](
+	ctx context.Context,
+	supplier func() (T, error),
+	maxRetryTimes int,
+	retryInterval time.Duration,
+	logger *logging.Logger) (T, error) {
+	var err error
+	var ret T
+	for i := 0; i < maxRetryTimes+1; i++ {
+		ret, err = supplier()
+		if err != nil {
+			if logger != nil {
+				logger.Info("Try %v/%v (sleep %v): %v",
+					i, maxRetryTimes, retryInterval, err)
+			}
+			timer := time.NewTimer(retryInterval)
+			select {
+			case <-timer.C:
+				// time to have the next try
+				continue
+			case <-ctx.Done():
+				// context is cancelled
+				var zero T
+				return zero, ctx.Err()
+			}
+		}
+		// success
+		return ret, nil
+	}
+	if logger != nil {
+		logger.Error("Max retry times reached, but it still fails. Last error: %v", err)
+	}
+	var zero T
+	return zero, err
+}
-- 
cgit v1.2.3