Skip to content

Commit

Permalink
ditto for seettings & webdav
Browse files Browse the repository at this point in the history
  • Loading branch information
refs authored and phil-davis committed Nov 6, 2020
1 parent dbbe58e commit ecd2b84
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions settings/pkg/command/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions webdav/pkg/command/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit ecd2b84

Please sign in to comment.