Merge pull request #289 from Thiht/fix/deadlock

fix: deadlock

Author: gwleclerc

server/handlers/mocks.go

@@ -28,9 +28,6 @@ func NewMocks(ms services.Mocks) *Mocks {
 }
 
 func (m *Mocks) GenericHandler(c echo.Context) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
 	actualRequest := types.HTTPRequestToRequest(c.Request())
 	b, _ := yaml.Marshal(actualRequest)
 	log.Debugf("Received request:\n---\n%s\n", string(b))
@@ -91,7 +88,9 @@ func (m *Mocks) GenericHandler(c echo.Context) error {
 				response = mock.Response
 			}
 
+			m.mu.Lock()
 			matchingMock.State.TimesCount++
+			m.mu.Unlock()
 			break
 		} else {
 			b, _ = yaml.Marshal(mock)
@@ -107,7 +106,9 @@ func (m *Mocks) GenericHandler(c echo.Context) error {
 
 		if len(exceededMocks) > 0 {
 			for _, mock := range exceededMocks {
+				m.mu.Lock()
 				mock.State.TimesCount++
+				m.mu.Unlock()
 			}
 			resp["message"] = types.SmockerMockExceeded
 			resp["nearest"] = exceededMocks