Fix unmarshal bug for poll interval in elasticreload (#34)

* Properly unmarshal elasticreloadsettings

Author: SeBBBe

helpers/timeduration_test.go

@@ -0,0 +1,22 @@
+package helpers
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestMarshalTimeDuration(t *testing.T) {
+	td := TimeDuration(2000000000)
+	expected := "\"1s\""
+	err := td.UnmarshalJSON([]byte(expected))
+	if err != nil {
+		t.Errorf("got error during unmarshal <%s>", err)
+	}
+	json, err := td.MarshalJSON()
+	if err != nil {
+		t.Errorf("got error during marshal <%s>", err)
+	}
+	if fmt.Sprintf("%s", json) != expected {
+		t.Errorf("expected<%s> got %s", expected, json)
+	}
+}

scenario/elasticreload.go

@@ -18,13 +18,13 @@ import (
 type (
 	// ElasticReloadCore Currently used ElasticReloadCore (as opposed to deprecated settings)
 	ElasticReloadCore struct {
-		session.AppSelection
 		// PollInterval time in-between polling for reload status
 		PollInterval helpers.TimeDuration `json:"pollinterval" displayname:"Poll interval" doc-key:"elasticreload.pollinterval"`
 	}
 
 	//ElasticReloadSettings specify app to reload
 	ElasticReloadSettings struct {
+		session.AppSelection
 		ElasticReloadCore
 	}
 
@@ -66,7 +66,11 @@ func (settings *ElasticReloadSettings) UnmarshalJSON(arg []byte) error {
 	if err := jsonit.Unmarshal(arg, &core); err != nil {
 		return errors.Wrapf(err, "failed to unmarshal action<%s>", ActionElasticReload)
 	}
-	*settings = ElasticReloadSettings{core}
+	var appSelection session.AppSelection
+	if err := jsonit.Unmarshal(arg, &appSelection); err != nil {
+		return errors.Wrapf(err, "failed to unmarshal action<%s>", ActionOpenApp)
+	}
+	*settings = ElasticReloadSettings{appSelection, core}
 	return nil
 }