eliott/ocis
1
0
Fork 0
mirror of https://github.com/owncloud/ocis synced 2026-04-25 17:25:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move wopi operation into connector and change logging

Browse Source
This commit is contained in:
Juan Pablo Villafáñez
2024-03-20 10:14:32 +01:00
parent 8f4806f1d4
commit aa58caef63
16 changed files with 1066 additions and 1165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/collaboration/pkg/command/server.go
View File

@@ -7,11 +7,12 @@ import (
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/services/collaboration/pkg/config"
"github.com/owncloud/ocis/v2/services/collaboration/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/collaboration/pkg/connector"
"github.com/owncloud/ocis/v2/services/collaboration/pkg/cs3wopiserver"
"github.com/owncloud/ocis/v2/services/collaboration/pkg/internal/logging"
"github.com/owncloud/ocis/v2/services/collaboration/pkg/server/grpc"
"github.com/owncloud/ocis/v2/services/collaboration/pkg/server/http"
"github.com/urfave/cli/v2"
@@ -27,7 +28,13 @@ func Server(cfg *config.Config) *cli.Command {
return configlog.ReturnFatal(parser.ParseConfig(cfg))
},
Action: func(c *cli.Context) error {
logger := logging.Configure(cfg.Service.Name, cfg.Log)
logger := log.NewLogger(
log.Name(cfg.Service.Name),
log.Level(cfg.Log.Level),
log.Pretty(cfg.Log.Pretty),
log.Color(cfg.Log.Color),
log.File(cfg.Log.File),
)
traceProvider, err := tracing.GetServiceTraceProvider(cfg.Tracing, cfg.Service.Name)
if err != nil {
return err
@@ -92,7 +99,7 @@ func Server(cfg *config.Config) *cli.Command {
})
*/
server, err := http.Server(
http.App(app),
http.Adapter(connector.NewHttpAdapter(app.GetGwc(), cfg)),
http.Logger(logger),
http.Config(cfg),
http.Context(ctx),