Pass the time to addPoint

FreifunkBremen · Apr 18, 2017 · 237e011 · 237e011
1 parent 0df8f5d
commit 237e011
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/database/influxdb/database.go b/database/influxdb/database.go
@@ -78,8 +78,8 @@ func Connect(configuration interface{}) (database.Connection, error) {
 	return db, nil
 }
 
-func (conn *Connection) addPoint(name string, tags models.Tags, fields models.Fields, time time.Time) {
-	point, err := client.NewPoint(name, tags.Map(), fields, time)
+func (conn *Connection) addPoint(name string, tags models.Tags, fields models.Fields, t ...time.Time) {
+	point, err := client.NewPoint(name, tags.Map(), fields, t...)
 	if err != nil {
 		panic(err)
 	}

diff --git a/database/influxdb/global.go b/database/influxdb/global.go
@@ -10,8 +10,8 @@ import (
 // InsertGlobals implementation of database
 func (conn *Connection) InsertGlobals(stats *runtime.GlobalStats, time time.Time) {
 	conn.addPoint(MeasurementGlobal, nil, GlobalStatsFields(stats), time)
-	conn.addCounterMap(CounterMeasurementModel, stats.Models)
-	conn.addCounterMap(CounterMeasurementFirmware, stats.Firmwares)
+	conn.addCounterMap(CounterMeasurementModel, stats.Models, time)
+	conn.addCounterMap(CounterMeasurementFirmware, stats.Firmwares, time)
 }
 
 // GlobalStatsFields returns fields for InfluxDB
@@ -29,16 +29,15 @@ func GlobalStatsFields(stats *runtime.GlobalStats) map[string]interface{} {
 // Saves the values of a CounterMap in the database.
 // The key are used as 'value' tag.
 // The value is used as 'counter' field.
-func (conn *Connection) addCounterMap(name string, m runtime.CounterMap) {
-	now := time.Now()
+func (conn *Connection) addCounterMap(name string, m runtime.CounterMap, t time.Time) {
 	for key, count := range m {
 		conn.addPoint(
 			name,
 			models.Tags{
 				models.Tag{Key: []byte("value"), Value: []byte(key)},
 			},
 			models.Fields{"count": count},
-			now,
+			t,
 		)
 	}
 }