sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config: add reva required config

Browse Source
This commit is contained in:
A.Unger
2021-08-12 11:18:55 +02:00
parent 8a80b990a8
commit 778ad717df
16 changed files with 77 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
storage/pkg/command/authbasic.go
+1
View File
@@ -95,6 +95,7 @@ func authBasicConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]in
"tracing_enabled": cfg.Tracing.Enabled,
"tracing_endpoint": cfg.Tracing.Endpoint,
"tracing_collector": cfg.Tracing.Collector,
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
"tracing_service_name": c.Command.Name,
},
"shared": map[string]interface{}{
storage/pkg/command/authbearer.go
+1
View File
@@ -90,6 +90,7 @@ func authBearerConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]i
"tracing_enabled": cfg.Tracing.Enabled,
"tracing_endpoint": cfg.Tracing.Endpoint,
"tracing_collector": cfg.Tracing.Collector,
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
"tracing_service_name": c.Command.Name,
},
"shared": map[string]interface{}{
storage/pkg/command/frontend.go
+1
View File
@@ -122,6 +122,7 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s
"tracing_enabled": cfg.Tracing.Enabled,
"tracing_endpoint": cfg.Tracing.Endpoint,
"tracing_collector": cfg.Tracing.Collector,
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
"tracing_service_name": c.Command.Name,
},
"shared": map[string]interface{}{
storage/pkg/command/gateway.go
+1
View File
@@ -113,6 +113,7 @@ func gatewayConfigFromStruct(c *cli.Context, cfg *config.Config, logger log.Logg
"tracing_enabled": cfg.Tracing.Enabled,
"tracing_endpoint": cfg.Tracing.Endpoint,
"tracing_collector": cfg.Tracing.Collector,
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
"tracing_service_name": c.Command.Name,
},
"shared": map[string]interface{}{
storage/pkg/command/groups.go
+3 -4
View File
@@ -7,18 +7,16 @@ import (
"path"
"path/filepath"
"github.com/owncloud/ocis/storage/pkg/tracing"
"github.com/owncloud/ocis/ocis-pkg/sync"
"github.com/cs3org/reva/cmd/revad/runtime"
"github.com/gofrs/uuid"
"github.com/micro/cli/v2"
"github.com/oklog/run"
ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/sync"
"github.com/owncloud/ocis/storage/pkg/config"
"github.com/owncloud/ocis/storage/pkg/flagset"
"github.com/owncloud/ocis/storage/pkg/server/debug"
"github.com/owncloud/ocis/storage/pkg/tracing"
"github.com/thejerf/suture/v4"
)
@@ -101,6 +99,7 @@ func groupsConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inter
"tracing_enabled": cfg.Tracing.Enabled,
"tracing_endpoint": cfg.Tracing.Endpoint,
"tracing_collector": cfg.Tracing.Collector,
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
"tracing_service_name": c.Command.Name,
},
"shared": map[string]interface{}{
storage/pkg/command/sharing.go
+1
View File
@@ -109,6 +109,7 @@ func sharingConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]inte
"tracing_enabled": cfg.Tracing.Enabled,
"tracing_endpoint": cfg.Tracing.Endpoint,
"tracing_collector": cfg.Tracing.Collector,
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
"tracing_service_name": c.Command.Name,
},
"shared": map[string]interface{}{
storage/pkg/command/storagehome.go
+1
View File
@@ -104,6 +104,7 @@ func storageHomeConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]
"tracing_enabled": cfg.Tracing.Enabled,
"tracing_endpoint": cfg.Tracing.Endpoint,
"tracing_collector": cfg.Tracing.Collector,
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
"tracing_service_name": c.Command.Name,
},
"shared": map[string]interface{}{
storage/pkg/command/storagemetadata.go
+1
View File
@@ -142,6 +142,7 @@ func storageMetadataFromStruct(c *cli.Context, cfg *config.Config) map[string]in
"tracing_enabled": cfg.Tracing.Enabled,
"tracing_endpoint": cfg.Tracing.Endpoint,
"tracing_collector": cfg.Tracing.Collector,
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
"tracing_service_name": c.Command.Name,
},
"shared": map[string]interface{}{
storage/pkg/command/storagepubliclink.go
+1
View File
@@ -85,6 +85,7 @@ func storagePublicLinkConfigFromStruct(c *cli.Context, cfg *config.Config) map[s
"tracing_enabled": cfg.Tracing.Enabled,
"tracing_endpoint": cfg.Tracing.Endpoint,
"tracing_collector": cfg.Tracing.Collector,
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
"tracing_service_name": c.Command.Name,
},
"shared": map[string]interface{}{
storage/pkg/command/storageusers.go
+1
View File
@@ -104,6 +104,7 @@ func storageUsersConfigFromStruct(c *cli.Context, cfg *config.Config) map[string
"tracing_enabled": cfg.Tracing.Enabled,
"tracing_endpoint": cfg.Tracing.Endpoint,
"tracing_collector": cfg.Tracing.Collector,
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
"tracing_service_name": c.Command.Name,
},
"shared": map[string]interface{}{
storage/pkg/command/users.go
+1
View File
@@ -102,6 +102,7 @@ func usersConfigFromStruct(c *cli.Context, cfg *config.Config) map[string]interf
"tracing_enabled": cfg.Tracing.Enabled,
"tracing_endpoint": cfg.Tracing.Endpoint,
"tracing_collector": cfg.Tracing.Collector,
"tracing_service": ociscfg.TracingService(cfg.Tracing.Enabled),
"tracing_service_name": c.Command.Name,
},
"shared": map[string]interface{}{