Provide default values for flush interval. (#62)

Event relay would panic with a default value of 0.
launchdarkly · Aug 4, 2018 · 79f6d77 · 79f6d77
1 parent 607d1af
commit 79f6d77
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/internal/events/event-relay.go b/internal/events/event-relay.go
@@ -131,11 +131,16 @@ func NewEventRelayHandler(sdkKey string, config Config, featureStore ld.FeatureS
 }
 
 func newEventVerbatimRelay(sdkKey string, config Config) *eventVerbatimRelay {
-	publisher, _ := NewHttpEventPublisher(sdkKey,
+	opts := []OptionType{
 		OptionCapacity(config.Capacity),
 		OptionUri(config.EventsUri),
-		OptionFlushInterval(time.Duration(config.FlushIntervalSecs)*time.Second),
-	)
+	}
+
+	if config.FlushIntervalSecs > 0 {
+		opts = append(opts, OptionFlushInterval(time.Duration(config.FlushIntervalSecs)*time.Second))
+	}
+
+	publisher, _ := NewHttpEventPublisher(sdkKey, opts...)
 
 	res := &eventVerbatimRelay{
 		config:    config,

diff --git a/internal/events/event_publisher.go b/internal/events/event_publisher.go
@@ -154,7 +154,9 @@ func NewHttpEventPublisher(sdkKey string, options ...OptionType) (*HttpEventPubl
 		}
 		switch o := o.(type) {
 		case OptionFlushInterval:
-			flushInterval = time.Duration(o)
+			if o > 0 {
+				flushInterval = time.Duration(o)
+			}
 		}
 	}
 

diff --git a/relay.go b/relay.go
@@ -44,6 +44,7 @@ const (
 	defaultStreamUri             = "https://stream.launchdarkly.com/"
 	defaultHeartbeatIntervalSecs = 180
 	defaultMetricsPrefix         = "launchdarkly_relay"
+	defaultFlushIntervalSecs     = 5
 
 	userAgentHeader = "user-agent"
 )
@@ -186,6 +187,7 @@ func init() {
 	DefaultConfig.Main.HeartbeatIntervalSecs = defaultHeartbeatIntervalSecs
 	DefaultConfig.Main.Port = defaultPort
 	DefaultConfig.Redis.LocalTtl = defaultRedisLocalTtlMs
+	DefaultConfig.Events.FlushIntervalSecs = defaultFlushIntervalSecs
 }
 
 // LoadConfigFile reads a config file into a Config struct