Mercurial > gemma

comparison pkg/controllers/importqueue.go @ 4084:350a24c92848 timezone

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deliver times from import queue in UTC.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 25 Jul 2019 16:58:27 +0200
parents 80bdcd137a1d
children 1b1218bbd414
comparison
equal deleted inserted replaced
4083:2df48e364721 4084:350a24c92848
223 return nil 223 return nil
224 case err != nil: 224 case err != nil:
225 log.Printf("warn: %v\n", err) 225 log.Printf("warn: %v\n", err)
226 return nil 226 return nil
227 } 227 }
228 return &models.ImportTime{Time: when} 228 return &models.ImportTime{Time: when.UTC()}
229 } 229 }
230 230
231 func listImports( 231 func listImports(
232 _ interface{}, 232 _ interface{},
233 req *http.Request, 233 req *http.Request,
286 return 286 return
287 } 287 }
288 if signer.Valid { 288 if signer.Valid {
289 it.Signer = signer.String 289 it.Signer = signer.String
290 } 290 }
291 it.Enqueued = models.ImportTime{Time: enqueued} 291 it.Enqueued = models.ImportTime{Time: enqueued.UTC()}
292 imports = append(imports, &it) 292 imports = append(imports, &it)
293 } 293 }
294 294
295 if err = rows.Err(); err != nil { 295 if err = rows.Err(); err != nil {
296 return 296 return
345 } 345 }
346 return 346 return
347 case err != nil: 347 case err != nil:
348 return 348 return
349 } 349 }
350 enqueued = enqueued.UTC()
350 351
351 var sum interface{} 352 var sum interface{}
352 if summary.Valid { 353 if summary.Valid {
353 if err = json.NewDecoder( 354 if err = json.NewDecoder(
354 strings.NewReader(summary.String)).Decode(&sum); err != nil { 355 strings.NewReader(summary.String)).Decode(&sum); err != nil {
366 367
367 entries := make([]*models.ImportLogEntry, 0, 10) 368 entries := make([]*models.ImportLogEntry, 0, 10)
368 369
369 for rows.Next() { 370 for rows.Next() {
370 var entry models.ImportLogEntry 371 var entry models.ImportLogEntry
371 if err = rows.Scan(&entry.Time, &entry.Kind, &entry.Message); err != nil { 372 var t time.Time
373 if err = rows.Scan(&t, &entry.Kind, &entry.Message); err != nil {
372 return 374 return
373 } 375 }
376 entry.Time = models.ImportTime{t.UTC()}
374 entries = append(entries, &entry) 377 entries = append(entries, &entry)
375 } 378 }
376 379
377 if err = rows.Err(); err != nil { 380 if err = rows.Err(); err != nil {
378 return 381 return