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

ditto for seettings & webdav

Browse Source
This commit is contained in:
A.Unger
2020-11-06 08:25:31 +05:45
committed by Phil Davis
parent dbbe58e440
commit ecd2b8474d
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
settings/pkg/command/server.go
+4 -3
View File
@@ -2,12 +2,13 @@ package command
import ( import (
"context" "context"
"github.com/owncloud/ocis/settings/pkg/metrics"
"os" "os"
"os/signal" "os/signal"
"strings" "strings"
"time" "time"
"github.com/owncloud/ocis/settings/pkg/metrics"
"contrib.go.opencensus.io/exporter/jaeger" "contrib.go.opencensus.io/exporter/jaeger"
"contrib.go.opencensus.io/exporter/ocagent" "contrib.go.opencensus.io/exporter/ocagent"
"contrib.go.opencensus.io/exporter/zipkin" "contrib.go.opencensus.io/exporter/zipkin"
@@ -143,8 +144,8 @@ func Server(cfg *config.Config) *cli.Command {
http.Context(ctx), http.Context(ctx),
http.Config(cfg), http.Config(cfg),
http.Metrics(mtrcs), http.Metrics(mtrcs),
http.Flags(flagset.RootWithConfig(cfg)), http.Flags(flagset.RootWithConfig(config.New())),
http.Flags(flagset.ServerWithConfig(cfg)), http.Flags(flagset.ServerWithConfig(config.New())),
) )
gr.Add(server.Run, func(_ error) { gr.Add(server.Run, func(_ error) {
webdav/pkg/command/server.go
+2 -2
View File
@@ -139,8 +139,8 @@ func Server(cfg *config.Config) *cli.Command {
http.Context(ctx), http.Context(ctx),
http.Config(cfg), http.Config(cfg),
http.Metrics(metrics), http.Metrics(metrics),
http.Flags(flagset.RootWithConfig(cfg)), http.Flags(flagset.RootWithConfig(config.New())),
http.Flags(flagset.ServerWithConfig(cfg)), http.Flags(flagset.ServerWithConfig(config.New())),
) )
if err != nil { if err != nil {