Merge pull request #36 from BenB196/staging

Merge staging into master. Bump to v0.1.2

VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

ffsEvent/ffsEvent.go

@@ -216,7 +216,9 @@ func queryFetcher(query config.FFSQuery, inProgressQueries *[]eventOutput.InProg
 	}
 
 	//increase in progress queries
-	promMetrics.IncreaseInProgressQueries()
+	if !retryQuery {
+		promMetrics.IncreaseInProgressQueries()
+	}
 
 	//Add query interval to in progress query list
 	inProgressQuery, err := getOnOrBeforeAndAfter(query)
@@ -233,7 +235,7 @@ func queryFetcher(query config.FFSQuery, inProgressQueries *[]eventOutput.InProg
 	if err != nil {
 		log.Println("error getting file events for ffs query: " + query.Name)
 		//check if recoverable errors are thrown
-		if strings.Contains(err.Error(),"Error with gathering file events POST: 500 Internal Server Error") || (strings.Contains(err.Error(),"stream error: stream ID") && strings.Contains(err.Error(),"INTERNAL_ERROR")) {
+		if strings.Contains(err.Error(),"Error with gathering file events POST: 500 Internal Server Error") || (strings.Contains(err.Error(),"stream error: stream ID") && strings.Contains(err.Error(),"INTERNAL_ERROR")) || strings.Contains(err.Error(),"read: connection reset by peer") || strings.Contains(err.Error(),"POST: 400 Bad Request") {
 			//allow for 10 retries before killing to save resource overload.
 			log.Println("Attempting to recover from error: " + err.Error() + ". Retry number: " + strconv.Itoa(retryCount))
 			if retryCount <= 10 {