From 7e9d94cfda96f4229019d3a9ae1d854162595ae2 Mon Sep 17 00:00:00 2001 From: Jo Date: Thu, 17 Nov 2022 14:02:17 +0000 Subject: [PATCH] Chore: Extract server lock error so it can be used with errors.As (#58899) chore: extract server lock Error so it can be used with error.As --- pkg/infra/serverlock/errors.go | 9 +++++++++ pkg/infra/serverlock/serverlock.go | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 pkg/infra/serverlock/errors.go diff --git a/pkg/infra/serverlock/errors.go b/pkg/infra/serverlock/errors.go new file mode 100644 index 00000000000..f5fe91c68db --- /dev/null +++ b/pkg/infra/serverlock/errors.go @@ -0,0 +1,9 @@ +package serverlock + +type ServerLockExistsError struct { + actionName string +} + +func (e *ServerLockExistsError) Error() string { + return "there is already a lock for this actionName: " + e.actionName +} diff --git a/pkg/infra/serverlock/serverlock.go b/pkg/infra/serverlock/serverlock.go index 2b92dfdadb5..c595f1e19b7 100644 --- a/pkg/infra/serverlock/serverlock.go +++ b/pkg/infra/serverlock/serverlock.go @@ -2,7 +2,6 @@ package serverlock import ( "context" - "errors" "time" "go.opentelemetry.io/otel/attribute" @@ -185,7 +184,7 @@ func (sl *ServerLockService) acquireForRelease(ctx context.Context, actionName s if len(lockRows) > 0 { result := lockRows[0] if sl.isLockWithinInterval(result, maxInterval) { - return errors.New("there is already a lock for this actionName: " + actionName) + return &ServerLockExistsError{actionName: actionName} } else { // lock has timeouted, so we update the timestamp result.LastExecution = time.Now().Unix()