mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-28 03:08:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77 from owncloud/die-on-invalid-config

Browse Source 
Die on invalid config
This commit is contained in:
Benedikt Kulmann
2020-08-13 17:35:36 +02:00
committed by GitHub
parent 923fd5a3f3 2da46c6495
commit ae50872dfd
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
changelog/unreleased/exit-on-unresolved-assets.md
View File

@@ -1,7 +1,10 @@
Bugfix: exit when assets are not found
Bugfix: exit when assets or config are not found
When a non-existing assets folders is specified, there was only a warning log statement and the service served
When a non-existing assets folder is specified, there was only a warning log statement and the service served
the builtin assets instead. It is safe to exit the service in such a scenario, instead of serving other assets
than specified. We changed the log level to `Fatal` on non-existing assets.
Similar for the web config, it was not failing on service level, but only showing an error in the web ui, wenn
the specified config file could not be found. We changed the log level to `Fatal` as well.
https://github.com/owncloud/ocis-phoenix/pull/76
https://github.com/owncloud/ocis-phoenix/pull/77

10
pkg/service/v0/service.go
View File

@@ -79,21 +79,19 @@ func (p Phoenix) getPayload() (payload []byte, err error) {
// try loading from file
if _, err = os.Stat(p.config.Phoenix.Path); os.IsNotExist(err) {
p.logger.Error().
p.logger.Fatal().
Err(err).
Str("config", p.config.Phoenix.Path).
Msg("Phoenix config doesn't exist")
return
Msg("phoenix config doesn't exist")
}
payload, err = ioutil.ReadFile(p.config.Phoenix.Path)
if err != nil {
p.logger.Error().
p.logger.Fatal().
Err(err).
Str("config", p.config.Phoenix.Path).
Msg("Failed to read custom config")
Msg("failed to read custom config")
}
return
}