From 72630c329196bd01c629e4cd58c8ddd26749fc97 Mon Sep 17 00:00:00 2001
From: "A.Unger" <zyxancf@gmail.com>
Date: Fri, 2 Jul 2021 16:05:04 +0200
Subject: [PATCH] prevent race condition on starting an already running service

---
 ocis-pkg/sync/trap.go                    | 1 -
 storage/pkg/command/authbasic.go         | 2 +-
 storage/pkg/command/authbearer.go        | 2 +-
 storage/pkg/command/gateway.go           | 2 +-
 storage/pkg/command/groups.go            | 2 +-
 storage/pkg/command/sharing.go           | 2 +-
 storage/pkg/command/storagehome.go       | 2 +-
 storage/pkg/command/storagepubliclink.go | 2 +-
 storage/pkg/command/storageusers.go      | 2 +-
 storage/pkg/command/users.go             | 2 +-
 10 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ocis-pkg/sync/trap.go b/ocis-pkg/sync/trap.go
index c7c0e8bbef..13eb08a472 100644
--- a/ocis-pkg/sync/trap.go
+++ b/ocis-pkg/sync/trap.go
@@ -16,7 +16,6 @@ func Trap(gr *run.Group, cancel context.CancelFunc) {
 		<-stop
 		return nil
 	}, func(err error) {
-		close(stop)
 		cancel()
 	})
 }
diff --git a/storage/pkg/command/authbasic.go b/storage/pkg/command/authbasic.go
index 249781c440..3e0d11db41 100644
--- a/storage/pkg/command/authbasic.go
+++ b/storage/pkg/command/authbasic.go
@@ -78,7 +78,7 @@ func AuthBasic(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.AuthBasic.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/authbearer.go b/storage/pkg/command/authbearer.go
index 9a8e4a9aa0..d15b726fcd 100644
--- a/storage/pkg/command/authbearer.go
+++ b/storage/pkg/command/authbearer.go
@@ -73,7 +73,7 @@ func AuthBearer(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.AuthBearer.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go
index 935f23e200..70e9dbe3c7 100644
--- a/storage/pkg/command/gateway.go
+++ b/storage/pkg/command/gateway.go
@@ -96,7 +96,7 @@ func Gateway(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.Gateway.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/groups.go b/storage/pkg/command/groups.go
index fb631674be..3670aa79a9 100644
--- a/storage/pkg/command/groups.go
+++ b/storage/pkg/command/groups.go
@@ -84,7 +84,7 @@ func Groups(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.Groups.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/sharing.go b/storage/pkg/command/sharing.go
index 519c4a3870..08958b0586 100644
--- a/storage/pkg/command/sharing.go
+++ b/storage/pkg/command/sharing.go
@@ -92,7 +92,7 @@ func Sharing(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.Sharing.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/storagehome.go b/storage/pkg/command/storagehome.go
index 0b5ad9300d..3eb886f060 100644
--- a/storage/pkg/command/storagehome.go
+++ b/storage/pkg/command/storagehome.go
@@ -86,7 +86,7 @@ func StorageHome(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.StorageHome.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/storagepubliclink.go b/storage/pkg/command/storagepubliclink.go
index 75922f5900..87ca7e3ffd 100644
--- a/storage/pkg/command/storagepubliclink.go
+++ b/storage/pkg/command/storagepubliclink.go
@@ -68,7 +68,7 @@ func StoragePublicLink(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.StoragePublicLink.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/storageusers.go b/storage/pkg/command/storageusers.go
index 68a63637ce..e39df93cd0 100644
--- a/storage/pkg/command/storageusers.go
+++ b/storage/pkg/command/storageusers.go
@@ -86,7 +86,7 @@ func StorageUsers(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.StorageUsers.Supervised {
 				sync.Trap(&gr, cancel)
 			}
 
diff --git a/storage/pkg/command/users.go b/storage/pkg/command/users.go
index e264c5782a..f087c9a56a 100644
--- a/storage/pkg/command/users.go
+++ b/storage/pkg/command/users.go
@@ -85,7 +85,7 @@ func Users(cfg *config.Config) *cli.Command {
 				cancel()
 			})
 
-			if !cfg.Reva.StorageMetadata.Supervised {
+			if !cfg.Reva.Users.Supervised {
 				sync.Trap(&gr, cancel)
 			}