Merge pull request #2958 from gobitfly/NOBIDS/throttle_service_status…

…_updates

Nobids/throttle service status updates

handlers/search.go

@@ -176,10 +176,8 @@ func SearchAhead(w http.ResponseWriter, r *http.Request) {
 		} else {
 			err = db.ReaderDb.Select(result, `
 			SELECT validatorindex AS index, pubkeyhex AS pubkey
-			FROM validators
-			LEFT JOIN validator_names ON validators.pubkey = validator_names.publickey
-			WHERE LOWER(validator_names.name) LIKE LOWER($1)
-			ORDER BY index LIMIT 10`, search+"%")
+			FROM validators WHERE pubkey IN 
+				(SELECT publickey FROM validator_names WHERE LOWER(validator_names.name) LIKE LOWER($1) LIMIT 10)`, search+"%")
 		}
 	case "eth1_addresses":
 		if utils.IsValidEnsDomain(search) {
@@ -216,12 +214,9 @@ func SearchAhead(w http.ResponseWriter, r *http.Request) {
 		} else if thresholdHexLikeRE.MatchString(lowerStrippedSearch) {
 			err = db.ReaderDb.Select(result, `SELECT validatorindex AS index, pubkeyhex as pubkey FROM validators WHERE pubkeyhex LIKE ($1 || '%')`, lowerStrippedSearch)
 		} else {
-			err = db.ReaderDb.Select(result, `
-			SELECT validatorindex AS index, pubkeyhex AS pubkey
-			FROM validators
-			LEFT JOIN validator_names ON validators.pubkey = validator_names.publickey
-			WHERE LOWER(validator_names.name) LIKE LOWER($1)
-			ORDER BY index LIMIT 10`, search+"%")
+			err = db.ReaderDb.Select(result, `SELECT validatorindex AS index, pubkeyhex AS pubkey
+			FROM validators WHERE pubkey IN 
+				(SELECT publickey FROM validator_names WHERE LOWER(validator_names.name) LIKE LOWER($1) LIMIT 10)`, search+"%")
 		}
 	case "validators_by_pubkey":
 		if !thresholdHexLikeRE.MatchString(lowerStrippedSearch) {

services/status.go

@@ -3,17 +3,27 @@ package services
 import (
 	"encoding/json"
 	"os"
+	"time"
 
 	"github.com/gobitfly/eth2-beaconchain-explorer/db"
 	"github.com/gobitfly/eth2-beaconchain-explorer/utils"
 	"github.com/gobitfly/eth2-beaconchain-explorer/version"
 )
 
+var lastStatusUpdate = make(map[string]time.Time)
+
 // Report the status of a particular service, will add current Pid and executable name
+// Throttle calls to 1/min for each service name so that we don't report too often
 func ReportStatus(name, status string, metadata *json.RawMessage) {
 	if !utils.Config.ReportServiceStatus {
 		return
 	}
+
+	if lastUpdate, ok := lastStatusUpdate[name]; ok {
+		if time.Since(lastUpdate) < time.Minute {
+			return
+		}
+	}
 	pid := os.Getpid()
 	execName, err := os.Executable()
 	if err != nil {
@@ -33,4 +43,5 @@ func ReportStatus(name, status string, metadata *json.RawMessage) {
 	if err != nil {
 		utils.LogError(err, "error reporting service status", 0, map[string]interface{}{"name": name, "status": status})
 	}
+	lastStatusUpdate[name] = time.Now()
 }