From 742b571a5beff244d2abe77b17c6aea71af18b91 Mon Sep 17 00:00:00 2001
From: "A.Unger" <zyxancf@gmail.com>
Date: Thu, 4 Mar 2021 13:00:16 +0100
Subject: [PATCH] refactor token db away

---
 ocis/pkg/runtime/runtime.go | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/ocis/pkg/runtime/runtime.go b/ocis/pkg/runtime/runtime.go
index a8af1d98c5..8c7dc9adfc 100644
--- a/ocis/pkg/runtime/runtime.go
+++ b/ocis/pkg/runtime/runtime.go
@@ -37,9 +37,9 @@ var (
 		"ocs",
 		"onlyoffice",
 		"proxy",
-		"settings",
+		"settings", // done
 		"store",
-		"storage-metadata",
+		"storage-metadata", // done
 		"storage-frontend",
 		"storage-gateway",
 		"storage-userprovider",
@@ -56,7 +56,7 @@ var (
 
 	dependants = []string{
 		"storage-sharing",
-		"accounts",
+		"accounts", // done
 	}
 	// Maximum number of retries until getting a connection to the rpc runtime service.
 	maxRetries = 10
@@ -107,9 +107,9 @@ func (r *Runtime) Start() error {
 	r.c.Storage.Log.Color = r.c.Log.Color
 	r.c.Storage.Log.Pretty = r.c.Log.Pretty
 
-	tokens["settings"] = append(tokens["settings"], supervisor.Add(settings.NewSutureService(globalCtx, r.c.Settings)))
-	tokens["storagemetadata"] = append(tokens["storagemetadata"], supervisor.Add(storage.NewStorageMetadata(globalCtx, r.c.Storage)))
-	tokens["accounts"] = append(tokens["accounts"], supervisor.Add(accounts.NewSutureService(globalCtx, r.c.Accounts)))
+	addServiceToken("settings", supervisor.Add(settings.NewSutureService(globalCtx, r.c.Settings)))
+	addServiceToken("storagemetadata", supervisor.Add(storage.NewStorageMetadata(globalCtx, r.c.Storage)))
+	addServiceToken("accounts", supervisor.Add(accounts.NewSutureService(globalCtx, r.c.Accounts)))
 
 	go supervisor.ServeBackground()
 
@@ -121,6 +121,11 @@ func (r *Runtime) Start() error {
 	}
 }
 
+// addServiceToken adds a service token to a global slice of service tokens that contains services managed by the supervisor.
+func addServiceToken(service string, token suture.ServiceToken) {
+	tokens[service] = append(tokens[service], token)
+}
+
 // for logging reasons we don't want the same logging level on both oCIS and micro. As a framework builder we do not
 // want to expose to the end user the internal framework logs unless explicitly specified.a
 func setMicroLogger(log config.Log) {