Merge pull request #367 from kmala/bug

fix(sshd): unlock the repository when gitreceive succeeds or fails

Author: kmala

pkg/sshd/lock.go

@@ -38,9 +38,9 @@ func wrapInLock(lck RepositoryLock, repoName string, fn func() error) error {
 		case <-doneCh:
 		}
 	}()
+	defer lck.Unlock(repoName)
 	select {
 	case <-timer.C:
-		lck.Unlock(repoName)
 		defer close(doneCh)
 		return fmt.Errorf("%s lock exceeded timout", repoName)
 	case err := <-fnCh:

pkg/sshd/lock_test.go

@@ -1,6 +1,7 @@
 package sshd
 
 import (
+	"errors"
 	"sync"
 	"testing"
 	"time"
@@ -12,6 +13,10 @@ const (
 	callbackTimeout = 1 * time.Second
 )
 
+var (
+	gitError = errors.New("git receive error")
+)
+
 func TestMultipleSameRepoLocks(t *testing.T) {
 	var wg sync.WaitGroup
 	const repo = "repo1"
@@ -91,7 +96,10 @@ func TestWrapInLock(t *testing.T) {
 	assert.NoErr(t, wrapInLock(lck, "repo", func() error {
 		return nil
 	}))
-	lck.Lock("repo")
+	assert.Err(t, gitError, wrapInLock(lck, "repo", func() error {
+		return gitError
+	}))
+	assert.NoErr(t, lck.Lock("repo"))
 	assert.Err(t, errAlreadyLocked, wrapInLock(lck, "repo", func() error {
 		return nil
 	}))