Merge branch 'master' into update-bridge-docs

2021-09-29 12:09:29 +02:00
parent 5554c72d9a f36017f188
commit 6166bb5a4c
511 changed files with 12687 additions and 17566 deletions
@@ -6,7 +6,6 @@ import (
 	"io/ioutil"
 	"strings"

-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 	"github.com/owncloud/ocis/web/pkg/config"
@@ -15,6 +14,7 @@ import (
 	"github.com/owncloud/ocis/web/pkg/server/debug"
 	"github.com/owncloud/ocis/web/pkg/server/http"
 	"github.com/owncloud/ocis/web/pkg/tracing"
+	"github.com/urfave/cli/v2"
 )

 // Server is the entrypoint for the server command.
@@ -51,7 +51,7 @@ func Server(cfg *config.Config) *cli.Command {
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)

-			if err := tracing.Configure(cfg, logger); err != nil {
+			if err := tracing.Configure(cfg); err != nil {
 				return err
 			}