move config validation into a separate function
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
package defaults
|
||||
|
||||
import (
|
||||
"log"
|
||||
"path"
|
||||
|
||||
"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
|
||||
@@ -10,10 +9,8 @@ import (
|
||||
|
||||
func FullDefaultConfig() *config.Config {
|
||||
cfg := DefaultConfig()
|
||||
|
||||
EnsureDefaults(cfg)
|
||||
Sanitize(cfg)
|
||||
|
||||
return cfg
|
||||
}
|
||||
|
||||
@@ -76,8 +73,6 @@ func EnsureDefaults(cfg *config.Config) {
|
||||
|
||||
if cfg.Thumbnail.TransferSecret == "" && cfg.Commons != nil && cfg.Commons.TransferSecret != "" {
|
||||
cfg.Thumbnail.TransferSecret = cfg.Commons.TransferSecret
|
||||
} else if cfg.TransferSecret == "" {
|
||||
log.Fatalf("reva transfer secret is not set up properly, bailing out (%s)", cfg.Service.Name)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user