comparison pkg/imports/queue.go @ 1138:443fc80a315f

Don't issue new lines at end of log messages when importing.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 09 Nov 2018 10:57:49 +0100
parents a5069da2f0b7
children 930fdd8b474f
comparison
equal deleted inserted replaced
1137:2fb6c0a6ec8a 1138:443fc80a315f
350 return 350 return
351 } 351 }
352 352
353 feedback := logFeedback(idj.id) 353 feedback := logFeedback(idj.id)
354 354
355 feedback.Info("import #%d started\n", idj.id) 355 feedback.Info("import #%d started", idj.id)
356 356
357 errDo := survive(func() error { 357 errDo := survive(func() error {
358 return auth.RunAs(idj.user, context.Background(), 358 return auth.RunAs(idj.user, context.Background(),
359 func(conn *sql.Conn) error { return job.Do(conn, feedback) }) 359 func(conn *sql.Conn) error { return job.Do(conn, feedback) })
360 })() 360 })()
361 if errDo != nil { 361 if errDo != nil {
362 feedback.Error("error do: %v\n", errDo) 362 feedback.Error("error do: %v", errDo)
363 } 363 }
364 errCleanup := survive(job.CleanUp)() 364 errCleanup := survive(job.CleanUp)()
365 if errCleanup != nil { 365 if errCleanup != nil {
366 feedback.Error("error cleanup: %v\n", errCleanup) 366 feedback.Error("error cleanup: %v", errCleanup)
367 } 367 }
368 368
369 var state string 369 var state string
370 if errDo != nil || errCleanup != nil { 370 if errDo != nil || errCleanup != nil {
371 state = "failed" 371 state = "failed"