mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-23 20:49:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

enable konnectd + ocs

Browse Source
This commit is contained in:
A.Unger
2019-12-13 10:31:15 +01:00
parent 1ee963dcdd
commit f74995a626
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/command/konnectd.go
+7 -5
View File
@@ -11,6 +11,7 @@ import (
"github.com/owncloud/ocis-konnectd/pkg/metrics"
"github.com/owncloud/ocis-konnectd/pkg/server/http"
"github.com/owncloud/ocis/pkg/config"
"github.com/owncloud/ocis/pkg/register"
)
// KonnectdCommand is the entrypoint for the konnectd command.
@@ -31,7 +32,7 @@ func KonnectdCommand(cfg *config.Config) cli.Command {
}
// KonnectdHandler defines the direct server handler.
func KonnectdHandler(ctx context.Context, cancel context.CancelFunc, gr run.Group, cfg *config.Config) error {
func KonnectdHandler(ctx context.Context, cancel context.CancelFunc, gr *run.Group, cfg *config.Config) error {
scfg := configureKonnectd(cfg)
logger := command.NewLogger(scfg)
m := metrics.New()
@@ -72,12 +73,13 @@ func configureKonnectd(cfg *config.Config) *svcconfig.Config {
cfg.Konnectd.Log.Pretty = cfg.Log.Pretty
cfg.Konnectd.Log.Color = cfg.Log.Color
cfg.Konnectd.Tracing.Enabled = false
cfg.Konnectd.HTTP.Addr = "localhost:9011"
cfg.Konnectd.HTTP.Root = "/"
return cfg.Konnectd
}
// func init() {
// register.AddCommand(KonnectdCommand)
// register.AddHandler(KonnectdHandler)
// }
func init() {
register.AddCommand(KonnectdCommand)
register.AddHandler(KonnectdHandler)
}
pkg/command/ocs.go
+7 -5
View File
@@ -11,6 +11,7 @@ import (
"github.com/owncloud/ocis-ocs/pkg/metrics"
"github.com/owncloud/ocis-ocs/pkg/server/http"
"github.com/owncloud/ocis/pkg/config"
"github.com/owncloud/ocis/pkg/register"
)
// OCSCommand is the entrypoint for the ocs command.
@@ -31,7 +32,7 @@ func OCSCommand(cfg *config.Config) cli.Command {
}
// OCSHandler defines the direct server handler.
func OCSHandler(ctx context.Context, cancel context.CancelFunc, gr run.Group, cfg *config.Config) error {
func OCSHandler(ctx context.Context, cancel context.CancelFunc, gr *run.Group, cfg *config.Config) error {
scfg := configureOCS(cfg)
logger := command.NewLogger(scfg)
m := metrics.New()
@@ -72,12 +73,13 @@ func configureOCS(cfg *config.Config) *svcconfig.Config {
cfg.OCS.Log.Pretty = cfg.Log.Pretty
cfg.OCS.Log.Color = cfg.Log.Color
cfg.OCS.Tracing.Enabled = false
cfg.OCS.HTTP.Addr = "localhost:9109"
cfg.OCS.HTTP.Root = "/"
return cfg.OCS
}
// func init() {
// register.AddCommand(OCSCommand)
// register.AddHandler(OCSHandler)
// }
func init() {
register.AddCommand(OCSCommand)
register.AddHandler(OCSHandler)
}