Implement RetryKeepSecs configuration parameter

README.md

@@ -37,8 +37,9 @@ Most of the time you need to use default (recommended) configuration of grafsy,
 - `supervisor` - supervisor manager which is used to run Grafsy. e.g. systemd or supervisord. Default is none
 - `clientSendInterval` - the interval, after which client will send data to graphite. In seconds
 - `metricsPerSecond` - maximum amount of metrics which can be processed per second  
-    In case of problems with connection/amount of metrics, this configuration will save up to `MetricsPerSecond*ClientSendInterval*10` metrics in retryDir  
+    In case of problems with connection/amount of metrics, this configuration will save up to `MetricsPerSecond*RetryKeepSecs` metrics in retryDir  
     Also these 2 params are exactly allocating memory
+- `retryKeepSecs` - how many seconds should be kept in retry files, at least
 - `allowedMetrics` - regexp of allowed metric. Every metric which is not passing check against regexp will be removed
 - `log` - main log file, `-` is treated as STDOUT
 - `hostname` - alias to use instead of os.Hostname() result

config.go

@@ -51,6 +51,9 @@ type Config struct {
 	// Data, which was not sent will be buffered in this directory.
 	RetryDir string
 
+	// Time in seconds to keep metrics in retry file, at least
+	RetryKeepSecs int
+
 	// Prefix for metric to sum.
 	// Do not forget to include it in allowedMetrics if you change it.
 	SumPrefix string
@@ -145,6 +148,11 @@ func (conf *Config) LoadConfig(configFile string) error {
 			"MetricsPerSecond, ConnectTimeout must be greater than 0")
 	}
 
+	if conf.RetryKeepSecs <= 0 {
+		// Backward compatibility with old behavior
+		conf.RetryKeepSecs = conf.ClientSendInterval * 10
+	}
+
 	if conf.MonitoringPath == "" {
 		// This will be replaced later by monitoring routine
 		conf.MonitoringPath = "HOSTNAME"
@@ -262,7 +270,7 @@ func (conf *Config) GenerateLocalConfig() (*LocalConfig, error) {
 		/*
 			Retry file will take only 10 full buffers
 		*/
-		fileMetricSize:    conf.MetricsPerSecond * conf.ClientSendInterval * 10,
+		fileMetricSize:    conf.MetricsPerSecond * conf.RetryKeepSecs,
 		lg:                lg,
 		allowedMetrics:    regexp.MustCompile(conf.AllowedMetrics),
 		aggrRegexp:        regexp.MustCompile(fmt.Sprintf("^(%s|%s|%s|%s)..*", conf.AvgPrefix, conf.SumPrefix, conf.MinPrefix, conf.MaxPrefix)),

grafsy.toml

@@ -19,6 +19,9 @@ useACL = false
 
 retryDir = "/tmp/grafsy/retry"
 
+# By default this one is equal to clientSendInterval*10
+retryKeepSecs = 200
+
 sumPrefix = "SUM."
 avgPrefix = "AVG."
 minPrefix = "MIN."