Mercurial > gemma
changeset 875:371c756f0370 geo-style
Code simplification in geoserver boot configuration.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Sun, 30 Sep 2018 18:15:11 +0200 |
parents | da526b58c9c4 |
children | 8b9bd9ccdd93 |
files | pkg/geoserver/boot.go |
diffstat | 1 files changed, 24 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/geoserver/boot.go Sun Sep 30 15:36:17 2018 +0200 +++ b/pkg/geoserver/boot.go Sun Sep 30 18:15:11 2018 +0200 @@ -288,6 +288,12 @@ } func deleteWorkspace() error { + + // Should we delete our workspace first? + if !config.GeoServerClean() { + return nil + } + log.Println("info: delete workspace " + workspaceName) var ( url = config.GeoServerURL() @@ -308,6 +314,14 @@ return err } +func ensureStyles() error { + log.Println("info: creating styles") + + // TODO: Implement me! + + return nil +} + func prepareGeoServer() error { if config.DBUser() == "" { @@ -316,28 +330,23 @@ } if config.GeoServerURL() == "" { - log.Println("info: No tables to publish on GeoServer") + log.Println("info: No URL to GeoServer configured") return nil } - // Should we delete our workspace first? - if config.GeoServerClean() { - if err := deleteWorkspace(); err != nil { + for _, ensure := range []func() error{ + deleteWorkspace, + ensureWorkspace, + ensureDataStore, + ensureFeatures, + ensureStyles, + } { + if err := ensure(); err != nil { return err } } - if err := ensureWorkspace(); err != nil { - return err - } - - if err := ensureDataStore(); err != nil { - return err - } - - // TODO: Styles - - return ensureFeatures() + return nil } func ConfigureBoot() {