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

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
line wrap: on
line diff
--- a/pkg/controllers/importqueue.go	Thu Jul 25 16:46:06 2019 +0200
+++ b/pkg/controllers/importqueue.go	Thu Jul 25 16:58:27 2019 +0200
@@ -225,7 +225,7 @@
 		log.Printf("warn: %v\n", err)
 		return nil
 	}
-	return &models.ImportTime{Time: when}
+	return &models.ImportTime{Time: when.UTC()}
 }
 
 func listImports(
@@ -288,7 +288,7 @@
 		if signer.Valid {
 			it.Signer = signer.String
 		}
-		it.Enqueued = models.ImportTime{Time: enqueued}
+		it.Enqueued = models.ImportTime{Time: enqueued.UTC()}
 		imports = append(imports, &it)
 	}
 
@@ -347,6 +347,7 @@
 	case err != nil:
 		return
 	}
+	enqueued = enqueued.UTC()
 
 	var sum interface{}
 	if summary.Valid {
@@ -368,9 +369,11 @@
 
 	for rows.Next() {
 		var entry models.ImportLogEntry
-		if err = rows.Scan(&entry.Time, &entry.Kind, &entry.Message); err != nil {
+		var t time.Time
+		if err = rows.Scan(&t, &entry.Kind, &entry.Message); err != nil {
 			return
 		}
+		entry.Time = models.ImportTime{t.UTC()}
 		entries = append(entries, &entry)
 	}