fix(pkg/cleaner,pkg/sshd): remove the RLock, go back to the simple mutex

Author: Aaron Schlesinger

pkg/cleaner/cleaner.go

@@ -21,19 +21,11 @@ const (
 )
 
 type Ref struct {
-	mut *sync.RWMutex
+	mut *sync.Mutex
 }
 
 func NewRef() Ref {
-	return Ref{mut: new(sync.RWMutex)}
-}
-
-func (c Ref) RLock() {
-	c.mut.RLock()
-}
-
-func (c Ref) RUnlock() {
-	c.mut.RUnlock()
+	return Ref{mut: new(sync.Mutex)}
 }
 
 func (c Ref) Lock() {

pkg/sshd/server.go

@@ -180,9 +180,9 @@ func sendExitStatus(status uint32, channel ssh.Channel) error {
 	return err
 }
 
-func (s *server) withCleanerRLock(f func() error) error {
-	s.cleanerRef.RLock()
-	defer s.cleanerRef.RUnlock()
+func (s *server) withCleanerLock(f func() error) error {
+	s.cleanerRef.Lock()
+	defer s.cleanerRef.Unlock()
 	return f()
 }
 
@@ -240,7 +240,7 @@ func (s *server) answer(channel ssh.Channel, requests <-chan *ssh.Request, sshCo
 
 				repoName := parts[1]
 				errConcurrentPush := errors.New("concurrent push")
-				err := s.withCleanerRLock(func() error {
+				err := s.withCleanerLock(func() error {
 					if err := s.pushLock.Lock(repoName, time.Duration(0)); err != nil {
 						return errConcurrentPush
 					}