revert storage, remove tracing.service and bring back common
This commit is contained in:
@@ -7,7 +7,6 @@ import (
|
||||
"path"
|
||||
|
||||
"github.com/owncloud/ocis/ocis-pkg/sync"
|
||||
"github.com/owncloud/ocis/storage/pkg/logging"
|
||||
|
||||
"github.com/cs3org/reva/cmd/revad/runtime"
|
||||
"github.com/gofrs/uuid"
|
||||
@@ -30,7 +29,7 @@ func StorageHome(cfg *config.Config) *cli.Command {
|
||||
return ParseConfig(c, cfg, "storage-home")
|
||||
},
|
||||
Action: func(c *cli.Context) error {
|
||||
logger := logging.Configure(cfg.Service.Name, cfg.Log)
|
||||
logger := NewLogger(cfg)
|
||||
|
||||
tracing.Configure(cfg, logger)
|
||||
|
||||
@@ -147,7 +146,7 @@ type StorageHomeSutureService struct {
|
||||
|
||||
// NewStorageHomeSutureService creates a new storage.StorageHomeSutureService
|
||||
func NewStorageHome(cfg *ociscfg.Config) suture.Service {
|
||||
//cfg.Storage.Commons = cfg.Commons
|
||||
cfg.Storage.Commons = cfg.Commons
|
||||
return StorageHomeSutureService{
|
||||
cfg: cfg.Storage,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user