From ecd2b8474d2f7bdafcb97b9cd502fe86d12de482 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 5 Nov 2020 16:40:35 +0100 Subject: [PATCH] ditto for seettings & webdav --- settings/pkg/command/server.go | 7 ++++--- webdav/pkg/command/server.go | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/settings/pkg/command/server.go b/settings/pkg/command/server.go index f08b7340908..8f7774e92dc 100644 --- a/settings/pkg/command/server.go +++ b/settings/pkg/command/server.go @@ -2,12 +2,13 @@ package command import ( "context" - "github.com/owncloud/ocis/settings/pkg/metrics" "os" "os/signal" "strings" "time" + "github.com/owncloud/ocis/settings/pkg/metrics" + "contrib.go.opencensus.io/exporter/jaeger" "contrib.go.opencensus.io/exporter/ocagent" "contrib.go.opencensus.io/exporter/zipkin" @@ -143,8 +144,8 @@ func Server(cfg *config.Config) *cli.Command { http.Context(ctx), http.Config(cfg), http.Metrics(mtrcs), - http.Flags(flagset.RootWithConfig(cfg)), - http.Flags(flagset.ServerWithConfig(cfg)), + http.Flags(flagset.RootWithConfig(config.New())), + http.Flags(flagset.ServerWithConfig(config.New())), ) gr.Add(server.Run, func(_ error) { diff --git a/webdav/pkg/command/server.go b/webdav/pkg/command/server.go index 2759b2d52e9..7218a98f985 100644 --- a/webdav/pkg/command/server.go +++ b/webdav/pkg/command/server.go @@ -139,8 +139,8 @@ func Server(cfg *config.Config) *cli.Command { http.Context(ctx), http.Config(cfg), http.Metrics(metrics), - http.Flags(flagset.RootWithConfig(cfg)), - http.Flags(flagset.ServerWithConfig(cfg)), + http.Flags(flagset.RootWithConfig(config.New())), + http.Flags(flagset.ServerWithConfig(config.New())), ) if err != nil {