fix(pkg/sshd): remove global mutex lock

this lock was used as a test to verify that the global cleaner lock was
correct, and was accidentally checked in. removing this to go back to
the old behavior

Author: Aaron Schlesinger

pkg/sshd/lock.go

@@ -20,27 +20,12 @@ type RepositoryLock interface {
 	Unlock(repoName string, timeout time.Duration) error
 }
 
-type mutexLock struct {
-	mut *sync.Mutex
-}
-
-func (m *mutexLock) Lock(string, time.Duration) error {
-	m.mut.Lock()
-	return nil
-}
-
-func (m *mutexLock) Unlock(string, time.Duration) error {
-	m.mut.Unlock()
-	return nil
-}
-
 // NewInMemoryRepositoryLock returns a new instance of a RepositoryLock
 func NewInMemoryRepositoryLock() RepositoryLock {
-	return &mutexLock{mut: new(sync.Mutex)}
-	// return &inMemoryRepoLock{
-	// 	mutex:   &sync.RWMutex{},
-	// 	dataMap: make(map[string]bool),
-	// }
+	return &inMemoryRepoLock{
+		mutex:   &sync.RWMutex{},
+		dataMap: make(map[string]bool),
+	}
 }
 
 type inMemoryRepoLock struct {

pkg/sshd/server_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/deis/builder/pkg/controller"
 
 	"github.com/Masterminds/cookoo"
+	"github.com/deis/builder/pkg/cleaner"
 	"golang.org/x/crypto/ssh"
 )
 
@@ -269,8 +270,9 @@ func runServer(config *ssh.ServerConfig, c *Circuit, pushLock RepositoryLock, de
 		},
 	})
 
+	cleanerRef := cleaner.NewRef()
 	go func() {
-		if err := Serve(reg, router, c, gitHome, pushLock, deleteLock, cxt); err != nil {
+		if err := Serve(reg, router, c, gitHome, pushLock, cleanerRef, cxt); err != nil {
 			t.Fatalf("Failed serving with %s", err)
 		}
 	}()