switch all other services to struct tag based env config
This commit is contained in:
@@ -1,11 +1,7 @@
|
||||
//go:build !simple
|
||||
// +build !simple
|
||||
|
||||
package command
|
||||
|
||||
import (
|
||||
"github.com/owncloud/ocis/ocis-pkg/config"
|
||||
"github.com/owncloud/ocis/ocis-pkg/shared"
|
||||
"github.com/owncloud/ocis/ocis/pkg/register"
|
||||
"github.com/owncloud/ocis/store/pkg/command"
|
||||
"github.com/urfave/cli/v2"
|
||||
@@ -13,7 +9,7 @@ import (
|
||||
|
||||
// StoreCommand is the entrypoint for the ocs command.
|
||||
func StoreCommand(cfg *config.Config) *cli.Command {
|
||||
var globalLog shared.Log
|
||||
//var globalLog shared.Log
|
||||
|
||||
return &cli.Command{
|
||||
Name: "store",
|
||||
@@ -27,16 +23,16 @@ func StoreCommand(cfg *config.Config) *cli.Command {
|
||||
return err
|
||||
}
|
||||
|
||||
globalLog = cfg.Log
|
||||
//globalLog = cfg.Log
|
||||
|
||||
return nil
|
||||
},
|
||||
Action: func(c *cli.Context) error {
|
||||
// if accounts logging is empty in ocis.yaml
|
||||
if (cfg.Store.Log == shared.Log{}) && (globalLog != shared.Log{}) {
|
||||
// we can safely inherit the global logging values.
|
||||
cfg.Store.Log = globalLog
|
||||
}
|
||||
//if (cfg.Store.Log == shared.Log{}) && (globalLog != shared.Log{}) {
|
||||
// // we can safely inherit the global logging values.
|
||||
// cfg.Store.Log = globalLog
|
||||
//}
|
||||
|
||||
origCmd := command.Server(cfg.Store)
|
||||
return handleOriginalAction(c, origCmd)
|
||||
|
||||
Reference in New Issue
Block a user