fixed analyticsd bug on windows

Signed-off-by: Steve Hiehn <[email protected]>

Author: Andy Voellmer

analyticsd/daemon/daemon.go

@@ -97,7 +97,7 @@ var (
 )
 
 func (d *Daemon) Start() {
-	err := d.do(true)
+	err := d.do(false)
 	if err != nil {
 		d.logger.Println(err)
 	}
@@ -106,7 +106,8 @@ func (d *Daemon) Start() {
 		case <-d.doneChan:
 			return
 		case <-time.NewTicker(d.pollingInterval).C:
-			err := d.do(false)
+			isTimestampSet := d.lastTime != nil
+			err := d.do(isTimestampSet)
 
 			if err != nil {
 				d.logger.Println(err)
@@ -119,7 +120,7 @@ func (d *Daemon) Stop() {
 	d.doneChan <- true
 }
 
-func (d *Daemon) do(isFirstTime bool) error {
+func (d *Daemon) do(isTimestampSet bool) error {
 	var (
 		nextURL *string = nil
 		resources []Resource
@@ -138,10 +139,9 @@ func (d *Daemon) do(isFirstTime bool) error {
 
 	params := url.Values{}
 	params.Add("q", "type IN "+eventTypesFilter())
-	if !isFirstTime {
+	if isTimestampSet {
 		params.Add("q", "timestamp>"+d.lastTime.Format(ccTimeStampFormat))
 	}
-
 	err := fetch(params)
 	if err != nil {
 		return err
@@ -186,7 +186,7 @@ func (d *Daemon) do(isFirstTime bool) error {
 			"version":   d.version,
 		}
 
-		if !isFirstTime {
+		if isTimestampSet {
 			err = d.analyticsClient.Enqueue(analytics.Track{
 				UserId:     d.UUID,
 				Event:      eventType,
@@ -199,10 +199,8 @@ func (d *Daemon) do(isFirstTime bool) error {
 			return fmt.Errorf("failed to send analytics: %v", err)
 		}
 	}
-
 	return nil
 }
-
 func (d *Daemon) fetch(params url.Values, dest interface{}) error {
 	req, err := http.NewRequest(http.MethodGet, d.ccHost+"/v2/events", nil)
 	if err != nil {

go.sum

@@ -46,6 +46,7 @@ github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214 h1:WgfvpuKg42WVLkxNwzfFraXkTXPK36bMqXvMFN67clI=
 github.com/hooklift/assert v0.0.0-20170704181755-9d1defd6d214/go.mod h1:kj6hFWqfwSjFjLnYW5PK1DoxZ4O0uapwHRmd9jhln4E=
 github.com/hooklift/iso9660 v1.0.0 h1:GYN0ejrqTl1qtB+g+ics7xxWHp7J2B1zmr25O9EyG3c=
 github.com/hooklift/iso9660 v1.0.0/go.mod h1:sOC47ru8lB0DlU0EZ7BJ0KCP5rDqOvx0c/5K5ADm8H0=