fix: use same logger everywhere and include log for registered mimetypes

This commit is contained in:
Juan Pablo Villafáñez
2024-02-21 10:46:53 +01:00
parent ecc235bbec
commit eb77b4c276
3 changed files with 10 additions and 7 deletions
+1 -1
View File
@@ -42,7 +42,7 @@ func Server(cfg *config.Config) *cli.Command {
}()
defer cancel()
app, err := cs3wopiserver.Start(cfg) // grpc server needs decoupling
app, err := cs3wopiserver.Start(cfg, logger) // grpc server needs decoupling
if err != nil {
return err
}
@@ -3,14 +3,15 @@ package cs3wopiserver
import (
"context"
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/collaboration/pkg/config"
"github.com/owncloud/ocis/v2/services/collaboration/pkg/internal/app"
)
func Start(cfg *config.Config) (*app.DemoApp, error) {
func Start(cfg *config.Config, logger log.Logger) (*app.DemoApp, error) {
ctx := context.Background()
app, err := app.New(cfg)
app, err := app.New(cfg, logger)
if err != nil {
return nil, err
}
@@ -6,8 +6,6 @@ import (
"github.com/owncloud/ocis/v2/ocis-pkg/log"
"github.com/owncloud/ocis/v2/services/collaboration/pkg/config"
"github.com/owncloud/ocis/v2/services/collaboration/pkg/config/defaults"
"github.com/owncloud/ocis/v2/services/collaboration/pkg/internal/logging"
registryv1beta1 "github.com/cs3org/go-cs3apis/cs3/app/registry/v1beta1"
gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
@@ -31,7 +29,7 @@ type DemoApp struct {
Logger log.Logger
}
func New(cfg *config.Config) (*DemoApp, error) {
func New(cfg *config.Config, logger log.Logger) (*DemoApp, error) {
app := &DemoApp{
Config: cfg,
}
@@ -43,7 +41,7 @@ func New(cfg *config.Config) (*DemoApp, error) {
}
}
app.Logger = logging.Configure("wopiserver", defaults.FullDefaultConfig().Log)
app.Logger = logger
return app, nil
}
@@ -79,6 +77,10 @@ func (app *DemoApp) RegisterDemoApp(ctx context.Context) error {
mimeTypes = append(mimeTypes, m)
}
app.Logger.Debug().
Str("AppName", app.Config.App.Name).
Strs("Mimetypes", mimeTypes).
Msg("Registering mimetypes in the app provider")
// TODO: REVA has way to filter supported mimetypes (do we need to implement it here or is it in the registry?)
// TODO: an added app provider shouldn't last forever. Instead the registry should use a TTL