refactor: Moving unlock to a defer

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Jul 20, 2022 · 70d88d6 · 70d88d6
1 parent 6430eb9
commit 70d88d6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/pkg/share/amqp.go b/pkg/share/amqp.go
@@ -17,14 +17,13 @@ func (a *App) AmqpHandler(message amqp.Delivery) error {
 	}
 
 	a.Lock()
+	defer a.Unlock()
 
 	if share.Creation.IsZero() {
 		delete(a.shares, share.ID)
 	} else {
 		a.shares[share.ID] = share
 	}
 
-	a.Unlock()
-
 	return nil
 }
diff --git a/pkg/share/crud.go b/pkg/share/crud.go
@@ -29,6 +29,7 @@ func (a *App) generateID() (string, error) {
 // List shares
 func (a *App) List() (shares []provider.Share) {
 	a.RLock()
+	defer a.RUnlock()
 
 	var i int64
 	shares = make([]provider.Share, len(a.shares))
@@ -38,8 +39,6 @@ func (a *App) List() (shares []provider.Share) {
 		i++
 	}
 
-	a.RUnlock()
-
 	sort.Sort(provider.ShareByID(shares))
 
 	return shares

diff --git a/pkg/webhook/amqp.go b/pkg/webhook/amqp.go
@@ -17,14 +17,13 @@ func (a *App) AmqpHandler(message amqp.Delivery) error {
 	}
 
 	a.Lock()
+	defer a.Unlock()
 
 	if len(webhook.URL) == 0 {
 		delete(a.webhooks, webhook.ID)
 	} else {
 		a.webhooks[webhook.ID] = webhook
 	}
 
-	a.Unlock()
-
 	return nil
 }
diff --git a/pkg/webhook/crud.go b/pkg/webhook/crud.go
@@ -27,6 +27,7 @@ func (a *App) generateID() (string, error) {
 // List webhooks
 func (a *App) List() (webhooks []provider.Webhook) {
 	a.RLock()
+	defer a.RUnlock()
 
 	var i int64
 	webhooks = make([]provider.Webhook, len(a.webhooks))
@@ -36,8 +37,6 @@ func (a *App) List() (webhooks []provider.Webhook) {
 		i++
 	}
 
-	a.RUnlock()
-
 	sort.Sort(provider.WebhookByID(webhooks))
 
 	return webhooks