Mercurial > gemma

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use own logging package.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 20 Sep 2021 17:45:39 +0200
parents adf7b9f1273b
children f2204f91d286
comparison
equal deleted inserted replaced
5488:a726a92ea5c9 5490:5f47eeea988d
17 "context" 17 "context"
18 "database/sql" 18 "database/sql"
19 "encoding/csv" 19 "encoding/csv"
20 "encoding/json" 20 "encoding/json"
21 "fmt" 21 "fmt"
22 "log"
23 "net/http" 22 "net/http"
24 "strconv" 23 "strconv"
25 "strings" 24 "strings"
26 "sync" 25 "sync"
27 "time" 26 "time"
29 "github.com/gorilla/mux" 28 "github.com/gorilla/mux"
30 29
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/imports" 32 "gemma.intevation.de/gemma/pkg/imports"
33 "gemma.intevation.de/gemma/pkg/log"
34 "gemma.intevation.de/gemma/pkg/models" 34 "gemma.intevation.de/gemma/pkg/models"
35 35
36 mw "gemma.intevation.de/gemma/pkg/middleware" 36 mw "gemma.intevation.de/gemma/pkg/middleware"
37 ) 37 )
38 38
249 err := conn.QueryRowContext(ctx, fb.stmt.String(), fb.args...).Scan(&when) 249 err := conn.QueryRowContext(ctx, fb.stmt.String(), fb.args...).Scan(&when)
250 switch { 250 switch {
251 case err == sql.ErrNoRows: 251 case err == sql.ErrNoRows:
252 return nil 252 return nil
253 case err != nil: 253 case err != nil:
254 log.Printf("warn: %v\n", err) 254 log.Warnf("%v\n", err)
255 return nil 255 return nil
256 } 256 }
257 return &models.ImportTime{Time: when.UTC()} 257 return &models.ImportTime{Time: when.UTC()}
258 } 258 }
259 259
281 "#source", 281 "#source",
282 } 282 }
283 283
284 if err := out.Write(record); err != nil { 284 if err := out.Write(record); err != nil {
285 // Too late for HTTP status message. 285 // Too late for HTTP status message.
286 log.Printf("error: %v\n", err) 286 log.Errorf("%v\n", err)
287 return 287 return
288 } 288 }
289 289
290 conn := mw.GetDBConn(req) 290 conn := mw.GetDBConn(req)
291 ctx := req.Context() 291 ctx := req.Context()
292 var rows *sql.Rows 292 var rows *sql.Rows
293 if rows, err = conn.QueryContext(ctx, list.stmt.String(), list.args...); err != nil { 293 if rows, err = conn.QueryContext(ctx, list.stmt.String(), list.args...); err != nil {
294 log.Printf("error: %v\n", err) 294 log.Errorf("%v\n", err)
295 return 295 return
296 } 296 }
297 defer rows.Close() 297 defer rows.Close()
298 298
299 stringString := func(s sql.NullString) string { 299 stringString := func(s sql.NullString) string {
339 339
340 // Do some introspection on the job to be more verbose. 340 // Do some introspection on the job to be more verbose.
341 if jc := imports.FindJobCreator(imports.JobKind(kind)); jc != nil { 341 if jc := imports.FindJobCreator(imports.JobKind(kind)); jc != nil {
342 job := jc.Create() 342 job := jc.Create()
343 if err := common.FromJSONString(data, job); err != nil { 343 if err := common.FromJSONString(data, job); err != nil {
344 log.Printf("error: %v\n", err) 344 log.Errorf("%v\n", err)
345 } else if desc, ok := job.(Description); ok { 345 } else if desc, ok := job.(Description); ok {
346 if description, err = desc.Description(); err != nil { 346 if description, err = desc.Description(); err != nil {
347 log.Printf("error: %v\n", err) 347 log.Errorf("%v\n", err)
348 } 348 }
349 } 349 }
350 } 350 }
351 351
352 record[0] = strconv.FormatInt(id, 10) 352 record[0] = strconv.FormatInt(id, 10)
359 record[7] = state 359 record[7] = state
360 record[8] = strconv.FormatBool(warnings) 360 record[8] = strconv.FormatBool(warnings)
361 record[9] = strings.Replace(description, ",", "|", -1) 361 record[9] = strings.Replace(description, ",", "|", -1)
362 362
363 if err := out.Write(record); err != nil { 363 if err := out.Write(record); err != nil {
364 log.Printf("error: %v\n", err) 364 log.Errorf("%v\n", err)
365 return 365 return
366 } 366 }
367 } 367 }
368 368
369 out.Flush() 369 out.Flush()
370 if err := out.Error(); err != nil { 370 if err := out.Error(); err != nil {
371 log.Printf("error: %v\n", err) 371 log.Errorf("%v\n", err)
372 } 372 }
373 373
374 if err = rows.Err(); err != nil { 374 if err = rows.Err(); err != nil {
375 log.Printf("error: %v\n", err) 375 log.Errorf("%v\n", err)
376 return 376 return
377 } 377 }
378 } 378 }
379 379
380 func listImports(req *http.Request) (jr mw.JSONResult, err error) { 380 func listImports(req *http.Request) (jr mw.JSONResult, err error) {