mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-08 05:09:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

add recover branch

Browse Source
This commit is contained in:
A.Unger
2020-11-03 15:24:11 +01:00
parent 11dee33e3c
commit 1168bdbb5d
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
accounts/pkg/service/v0/service.go
View File

@@ -93,6 +93,16 @@ func (s Service) buildIndex() (*indexer.Indexer, error) {
func configFromSvc(cfg *config.Config) (*idxcfg.Config, error) {
c := idxcfg.New()
defer func(cfg *config.Config) {
l := log.NewLogger(log.Color(cfg.Log.Color), log.Pretty(cfg.Log.Pretty), log.Level(cfg.Log.Level))
if r := recover(); r != nil {
l.Error().
Str("panic", "recovered from panic while parsing index config from service configuration").
Interface("svc_config", cfg).
Msg("recovered from panic")
}
}(cfg)
if &cfg.Repo.Disk != nil {
c.Repo = idxcfg.Repo{
Disk: idxcfg.Disk{
@@ -123,6 +133,10 @@ func configFromSvc(cfg *config.Config) (*idxcfg.Config, error) {
}
}
if &cfg.ServiceUser != nil {
c.ServiceUser = cfg.ServiceUser
}
return c, nil
}