Added test for rate limiting

oxtoacart · oxtoacart · commit 2b94cad28838 · 2016-07-28T11:17:37.000-05:00
diff --git a/src/github.com/getlantern/flashlight/logging/logging.go b/src/github.com/getlantern/flashlight/logging/logging.go
@@ -319,7 +319,9 @@ func shouldReport(location string) bool {
 	lastReportedLock.Lock()
 	defer lastReportedLock.Unlock()
 	shouldReport := now.Sub(lastReported[location]) > logglyRateLimit
-	lastReported[location] = now
+	if shouldReport {
+		lastReported[location] = now
+	}
 	return shouldReport
 }
 
diff --git a/src/github.com/getlantern/flashlight/logging/logging_test.go b/src/github.com/getlantern/flashlight/logging/logging_test.go
@@ -60,18 +60,31 @@ func TestLoggly(t *testing.T) {
 	golog.RegisterReporter(r.Report)
 	log := golog.LoggerFor("test")
 
-	log.Error("")
-	log.Debugf("**************** %v", buf.String())
-	if assert.NoError(t, json.Unmarshal(buf.Bytes(), &result), "Unmarshal error") {
-		assert.Regexp(t, "test: logging_test.go:([0-9]+)", result["locationInfo"])
-		assert.Equal(t, "", result["message"])
+	origLogglyRateLimit := logglyRateLimit
+	defer func() {
+		logglyRateLimit = origLogglyRateLimit
+	}()
+	logglyRateLimit = 100 * time.Millisecond
+	for i := 0; i < 2; i++ {
+		buf.Reset()
+		log.Error("short message")
+		if i == 1 {
+			assert.Equal(t, 0, buf.Len(), "duplicate shouldn't have been reported")
+			time.Sleep(logglyRateLimit)
+		} else {
+			if assert.NoError(t, json.Unmarshal(buf.Bytes(), &result), "Unmarshal error") {
+				assert.Regexp(t, "test: logging_test.go:([0-9]+)", result["locationInfo"])
+				assert.Equal(t, "short message", result["message"])
+			}
+		}
 	}
 
 	buf.Reset()
-	log.Error("short message")
+	log.Error("")
+	log.Debugf("**************** %v", buf.String())
 	if assert.NoError(t, json.Unmarshal(buf.Bytes(), &result), "Unmarshal error") {
 		assert.Regexp(t, "test: logging_test.go:([0-9]+)", result["locationInfo"])
-		assert.Equal(t, "short message", result["message"])
+		assert.Equal(t, "", result["message"])
 	}
 
 	buf.Reset()
