--- a/pkg/geoserver/boot.go	Sat Aug 21 15:01:52 2021 +0200
+++ b/pkg/geoserver/boot.go	Mon Sep 20 17:45:39 2021 +0200
@@ -20,7 +20,6 @@
 	"encoding/xml"
 	"fmt"
 	"io"
-	"log"
 	"net/http"
 	"net/url"
 	"strings"
@@ -29,6 +28,7 @@
 	"golang.org/x/net/html/charset"
 
 	"gemma.intevation.de/gemma/pkg/config"
+	"gemma.intevation.de/gemma/pkg/log"
 	"gemma.intevation.de/gemma/pkg/models"
 )
 
@@ -55,7 +55,7 @@
 
 	if err := json.NewEncoder(&buf).Encode(x); err != nil {
 		// Should not happen
-		log.Printf("warn: bad JSON: %v\n", err)
+		log.Warnf("bad JSON: %v\n", err)
 	}
 	return bytes.NewReader(buf.Bytes())
 }
@@ -66,7 +66,7 @@
 	buf := bytes.NewBufferString(xml.Header)
 	if err := xml.NewEncoder(buf).Encode(x); err != nil {
 		// Should not happen
-		log.Printf("warn: bad XML: %v\n", err)
+		log.Warnf("bad XML: %v\n", err)
 	}
 	return bytes.NewReader(buf.Bytes())
 }
@@ -102,13 +102,13 @@
 	}
 
 	if resp.StatusCode != http.StatusNotFound {
-		log.Println("info: workspace " + workspaceName + " already exists.")
+		log.Infof("workspace " + workspaceName + " already exists.")
 		return nil
 	}
 
 	// Create workspace
 
-	log.Println("info: creating workspace " + workspaceName)
+	log.Infof("creating workspace " + workspaceName)
 
 	const createJSON = `{"workspace":{"name":"` + workspaceName + `"}}`
 
@@ -158,12 +158,12 @@
 	}
 
 	if resp.StatusCode != http.StatusNotFound {
-		log.Println("info: datastore " + datastoreName + " already exists.")
+		log.Infof("datastore " + datastoreName + " already exists.")
 		return nil
 	}
 
 	// Create datastore.
-	log.Println("info: creating datastore " + datastoreName)
+	log.Infoln("creating datastore " + datastoreName)
 
 	type entry struct {
 		Key   interface{} `json:"@key"`
@@ -221,11 +221,11 @@
 func ensureFeatures() error {
 	tables := models.InternalServices.Filter(models.IntWFS)
 	if len(tables) == 0 {
-		log.Println("info: no tables to publish")
+		log.Infoln("no tables to publish")
 		return nil
 	}
 
-	log.Printf("info: number of tables to publish %d\n", len(tables))
+	log.Infof("number of tables to publish %d\n", len(tables))
 
 	var (
 		geoURL   = config.GeoServerURL()
@@ -283,7 +283,7 @@
 
 	defer func() {
 		if len(already) > 0 {
-			log.Printf("info: already having featuretypes: %s\n",
+			log.Infof("already having featuretypes: %s\n",
 				strings.Join(already, ", "))
 		}
 	}()
@@ -297,7 +297,7 @@
 		}
 
 		// Create featuretype.
-		log.Printf("info: creating featuretype %s.\n", table)
+		log.Infof("creating featuretype %s.\n", table)
 
 		var req *http.Request
 
@@ -400,11 +400,11 @@
 
 	groups := models.InternalServices.LayerGroups()
 	if len(groups) == 0 {
-		log.Println("info: no groups layers to publish")
+		log.Infoln("info: no groups layers to publish")
 		return nil
 	}
 
-	log.Printf("info: number of layer groups to publish %d\n", len(groups))
+	log.Infof("number of layer groups to publish %d\n", len(groups))
 
 	var (
 		geoURL   = config.GeoServerURL()
@@ -457,7 +457,7 @@
 
 	defer func() {
 		if len(already) > 0 {
-			log.Printf("info: already having layer groups: %s\n",
+			log.Infof("already having layer groups: %s\n",
 				strings.Join(already, ", "))
 		}
 	}()
@@ -468,7 +468,7 @@
 			continue
 		}
 
-		log.Printf("info: creating layer group %s.\n", groups[i].Name)
+		log.Infof("creating layer group %s.\n", groups[i].Name)
 
 		type (
 			Layers struct {
@@ -529,7 +529,7 @@
 		return nil
 	}
 
-	log.Println("info: delete workspace " + workspaceName)
+	log.Infoln("info: delete workspace " + workspaceName)
 	var (
 		geoURL   = config.GeoServerURL()
 		user     = config.GeoServerUser()
@@ -626,7 +626,7 @@
 
 func updateStyle(entry *models.IntEntry, create bool) error {
 
-	log.Printf("info: creating style %s\n", entry.Name)
+	log.Infof("creating style %s\n", entry.Name)
 
 	// Try to load the style data.
 	binary, err := entry.LoadStyle()
@@ -761,7 +761,7 @@
 		case tok == nil && err == io.EOF:
 			return false
 		case err != nil:
-			log.Printf("warn: invalid XML: %v\n", err)
+			log.Warnf("invalid XML: %v\n", err)
 			return false
 		}
 		if t, ok := tok.(xml.StartElement); ok &&
@@ -772,7 +772,7 @@
 }
 
 func ensureStyles() error {
-	log.Println("info: creating styles")
+	log.Infoln("creating styles")
 
 	var stls styles
 	if err := stls.load(); err != nil {
@@ -788,7 +788,7 @@
 
 	defer func() {
 		if len(already) > 0 {
-			log.Printf("info: already having styles: %s\n",
+			log.Infof("already having styles: %s\n",
 				strings.Join(already, ", "))
 		}
 	}()
@@ -812,12 +812,12 @@
 func PrepareGeoServer() error {
 
 	if config.DBUser() == "" {
-		log.Println("info: Need metamorphic db user to configure GeoServer")
+		log.Infoln("need metamorphic db user to configure GeoServer")
 		return nil
 	}
 
 	if config.GeoServerURL() == "" {
-		log.Println("info: No URL to GeoServer configured")
+		log.Infoln("no URL to GeoServer configured")
 		return nil
 	}