fix more inheritance on storages
This commit is contained in:
@@ -13,6 +13,8 @@ import (
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/owncloud/ocis/ocis-pkg/shared"
|
||||
|
||||
mzlog "github.com/asim/go-micro/plugins/logger/zerolog/v4"
|
||||
"github.com/mohae/deepcopy"
|
||||
"github.com/olekukonko/tablewriter"
|
||||
@@ -159,10 +161,16 @@ func Start(o ...Option) error {
|
||||
FailureBackoff: 3 * time.Second,
|
||||
})
|
||||
|
||||
s.cfg.Storage.Log.Color = s.cfg.Log.Color
|
||||
s.cfg.Storage.Log.Level = s.cfg.Log.Level
|
||||
s.cfg.Storage.Log.Pretty = s.cfg.Log.Pretty
|
||||
s.cfg.Storage.Log.File = s.cfg.Log.File
|
||||
if s.cfg.Commons == nil {
|
||||
s.cfg.Commons = &shared.Commons{
|
||||
Log: &shared.Log{},
|
||||
}
|
||||
}
|
||||
|
||||
s.cfg.Storage.Log.Color = s.cfg.Commons.Color
|
||||
s.cfg.Storage.Log.Level = s.cfg.Commons.Level
|
||||
s.cfg.Storage.Log.Pretty = s.cfg.Commons.Pretty
|
||||
s.cfg.Storage.Log.File = s.cfg.Commons.File
|
||||
|
||||
if err = rpc.Register(s); err != nil {
|
||||
if s != nil {
|
||||
|
||||
Reference in New Issue
Block a user