comparison pkg/controllers/system.go @ 5490:5f47eeea988d logging

Use own logging package.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 20 Sep 2021 17:45:39 +0200
parents 24156a964eaa
children 31973f6f5cca
comparison
equal deleted inserted replaced
5488:a726a92ea5c9 5490:5f47eeea988d
17 "bytes" 17 "bytes"
18 "context" 18 "context"
19 "database/sql" 19 "database/sql"
20 "fmt" 20 "fmt"
21 "io/ioutil" 21 "io/ioutil"
22 "log"
23 "net/http" 22 "net/http"
24 "regexp" 23 "regexp"
25 "strings" 24 "strings"
26 "sync" 25 "sync"
27 "time" 26 "time"
31 "gemma.intevation.de/gemma/pkg/auth" 30 "gemma.intevation.de/gemma/pkg/auth"
32 "gemma.intevation.de/gemma/pkg/common" 31 "gemma.intevation.de/gemma/pkg/common"
33 "gemma.intevation.de/gemma/pkg/config" 32 "gemma.intevation.de/gemma/pkg/config"
34 "gemma.intevation.de/gemma/pkg/geoserver" 33 "gemma.intevation.de/gemma/pkg/geoserver"
35 "gemma.intevation.de/gemma/pkg/imports" 34 "gemma.intevation.de/gemma/pkg/imports"
35 "gemma.intevation.de/gemma/pkg/log"
36 "gemma.intevation.de/gemma/pkg/models" 36 "gemma.intevation.de/gemma/pkg/models"
37 37
38 mw "gemma.intevation.de/gemma/pkg/middleware" 38 mw "gemma.intevation.de/gemma/pkg/middleware"
39 ) 39 )
40 40
195 } 195 }
196 196
197 styles := strings.Split(which, ",") 197 styles := strings.Split(which, ",")
198 198
199 doBoth := func(req *http.Request) { 199 doBoth := func(req *http.Request) {
200 log.Printf("info: Trigger re-calculation of %s.", which) 200 log.Infof("trigger re-calculation of %s.", which)
201 for _, style := range styles { 201 for _, style := range styles {
202 geoserver.ReconfigureStyle(style) 202 geoserver.ReconfigureStyle(style)
203 } 203 }
204 recalc(req) 204 recalc(req)
205 } 205 }
208 return doBoth, nil 208 return doBoth, nil
209 } 209 }
210 210
211 oldCVs, err := models.ParseColorValues(old.String) 211 oldCVs, err := models.ParseColorValues(old.String)
212 if err != nil { 212 if err != nil {
213 log.Printf("warn: old config value is broken: %v\n", err) 213 log.Warnf("old config value is broken: %v\n", err)
214 return doBoth, nil 214 return doBoth, nil
215 } 215 }
216 216
217 if len(currCVs) != len(oldCVs) { 217 if len(currCVs) != len(oldCVs) {
218 return doBoth, nil 218 return doBoth, nil
229 } 229 }
230 } 230 }
231 231
232 // Only the color changed -> no expensive recalc needed. 232 // Only the color changed -> no expensive recalc needed.
233 if colorChanged { 233 if colorChanged {
234 log.Println("info: Only colors changed.") 234 log.Infof("only colors changed.")
235 return func(*http.Request) { 235 return func(*http.Request) {
236 for _, style := range styles { 236 for _, style := range styles {
237 geoserver.ReconfigureStyle(style) 237 geoserver.ReconfigureStyle(style)
238 } 238 }
239 }, nil 239 }, nil
285 func triggerSoundingResultsContoursRecalc(who, breaks string) { 285 func triggerSoundingResultsContoursRecalc(who, breaks string) {
286 var serialized string 286 var serialized string
287 job := &imports.IsoRefresh{ClassBreaks: breaks} 287 job := &imports.IsoRefresh{ClassBreaks: breaks}
288 serialized, err := common.ToJSONString(job) 288 serialized, err := common.ToJSONString(job)
289 if err != nil { 289 if err != nil {
290 log.Printf("error: %v\n", err) 290 log.Errorf("%v\n", err)
291 return 291 return
292 } 292 }
293 var jobID int64 293 var jobID int64
294 if jobID, err = imports.AddJob( 294 if jobID, err = imports.AddJob(
295 imports.ISRJobKind, 295 imports.ISRJobKind,
298 nil, 298 nil,
299 who, 299 who,
300 false, 300 false,
301 serialized, 301 serialized,
302 ); err != nil { 302 ); err != nil {
303 log.Printf("error: %v\n", err) 303 log.Errorf("%v\n", err)
304 return 304 return
305 } 305 }
306 log.Printf( 306 log.Infof(
307 "info: Recalculate sounding results contours in job %d.\n", 307 "recalculate sounding results contours in job %d.\n",
308 jobID) 308 jobID)
309 309
310 } 310 }
311 311
312 func deleteSoundingDiffs() { 312 func deleteSoundingDiffs() {
317 func(conn *sql.Conn) error { 317 func(conn *sql.Conn) error {
318 _, err := conn.ExecContext(ctx, deleteSoundingDiffsSQL) 318 _, err := conn.ExecContext(ctx, deleteSoundingDiffsSQL)
319 return err 319 return err
320 }, 320 },
321 ); err != nil { 321 ); err != nil {
322 log.Printf("error: Cleaning sounding diffs cache failed: %v\n", err) 322 log.Errorf("cleaning sounding diffs cache failed: %v\n", err)
323 } 323 }
324 } 324 }
325 325
326 func setSystemSettings(req *http.Request) (jr mw.JSONResult, err error) { 326 func setSystemSettings(req *http.Request) (jr mw.JSONResult, err error) {
327 327