From fd6a169b18899a64fd3e18ff539e0ef4b2cc8e45 Mon Sep 17 00:00:00 2001
From: Julian Kornberger <jk+github@digineo.de>
Date: Mon, 30 Jan 2017 00:44:56 +0100
Subject: [PATCH] Use fixed value for the batch timer

---
 database/database.go | 8 ++++----
 models/config.go     | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/database/database.go b/database/database.go
index 8e1eeea..d6d80e8 100644
--- a/database/database.go
+++ b/database/database.go
@@ -17,6 +17,7 @@ const (
 	MeasurementFirmware = "firmware" // Measurement for firmware statistics
 	MeasurementModel    = "model"    // Measurement for model statistics
 	batchMaxSize        = 500
+	batchTimeout        = 5 * time.Second
 )
 
 type DB struct {
@@ -121,8 +122,7 @@ func (db *DB) addWorker() {
 	var bp client.BatchPoints
 	var err error
 	var writeNow, closed bool
-	batchDuration := db.config.Influxdb.SaveInterval.Duration
-	timer := time.NewTimer(batchDuration)
+	timer := time.NewTimer(batchTimeout)
 
 	for !closed {
 		// wait for new points
@@ -131,7 +131,7 @@ func (db *DB) addWorker() {
 			if ok {
 				if bp == nil {
 					// create new batch
-					timer.Reset(batchDuration)
+					timer.Reset(batchTimeout)
 					if bp, err = client.NewBatchPoints(bpConfig); err != nil {
 						log.Fatal(err)
 					}
@@ -142,7 +142,7 @@ func (db *DB) addWorker() {
 			}
 		case <-timer.C:
 			if bp == nil {
-				timer.Reset(batchDuration)
+				timer.Reset(batchTimeout)
 			} else {
 				writeNow = true
 			}
diff --git a/models/config.go b/models/config.go
index bdb62a7..3793a76 100644
--- a/models/config.go
+++ b/models/config.go
@@ -34,7 +34,6 @@ type Config struct {
 		Database       string
 		Username       string
 		Password       string
-		SaveInterval   Duration // Save nodes every n seconds
 		DeleteInterval Duration // Delete stats of nodes every n minutes
 		DeleteAfter    Duration // Delete stats of nodes till now-deletetill n minutes
 	}