fix issue with locking broken (#1619)

* fix issue with locking broken return lock result: false
diggerhq · Jul 15, 2024 · 06dac15 · 06dac15
1 parent 3c3587f
commit 06dac15
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/libs/execution/execution.go b/libs/execution/execution.go
@@ -28,7 +28,6 @@ type Executor interface {
 }
 
 type LockingExecutorWrapper struct {
-	Enable      bool
 	ProjectLock locking.ProjectLock
 	Executor    Executor
 }
@@ -83,9 +82,6 @@ func (l LockingExecutorWrapper) Unlock() error {
 }
 
 func (l LockingExecutorWrapper) Lock() error {
-	if !l.Enable {
-		return nil
-	}
 	_, err := l.ProjectLock.Lock()
 	if err != nil {
 		return fmt.Errorf("failed to acquire lock: %s, %v", l.ProjectLock.LockId(), err)

diff --git a/libs/locking/locking.go b/libs/locking/locking.go
@@ -61,7 +61,7 @@ func (projectLock *PullRequestLock) Lock() (bool, error) {
 		return false, nil
 	}
 
-	var existingLockTransactionId *int
+	existingLockTransactionId, err := projectLock.InternalLock.GetLock(lockId)
 
 	if err != nil {
 		log.Printf("failed to get lock: %v\n", err)