From f74995a6262b23923ba284c4cf61214f8e8c6d8b Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Fri, 13 Dec 2019 10:31:15 +0100 Subject: [PATCH] enable konnectd + ocs --- pkg/command/konnectd.go | 12 +++++++----- pkg/command/ocs.go | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pkg/command/konnectd.go b/pkg/command/konnectd.go index 9d16d3cccf..ba152da9f2 100644 --- a/pkg/command/konnectd.go +++ b/pkg/command/konnectd.go @@ -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) +} diff --git a/pkg/command/ocs.go b/pkg/command/ocs.go index c240183106..b29336cb27 100644 --- a/pkg/command/ocs.go +++ b/pkg/command/ocs.go @@ -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) +}