cleanup relay-status check (#335)

flashbots · Sep 20, 2022 · 53dc630 · 53dc630
1 parent 306a23c
commit 53dc630
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/cli/main.go b/cli/main.go
@@ -87,7 +87,7 @@ func Main() {
 		lvl, err := logrus.ParseLevel(*logLevel)
 		if err != nil {
 			flag.Usage()
-			log.Fatalf("Invalid loglevel: %s", *logLevel)
+			log.Fatalf("invalid loglevel: %s", *logLevel)
 		}
 		logrus.SetLevel(lvl)
 	}
@@ -110,14 +110,14 @@ func Main() {
 		genesisForkVersionHex = genesisForkVersionGoerli
 	} else {
 		flag.Usage()
-		log.Fatal("Please specify a genesis fork version (eg. -mainnet / -kiln / -ropsten / -sepolia / -goerli / -genesis-fork-version flags)")
+		log.Fatal("please specify a genesis fork version (eg. -mainnet / -sepolia / -goerli / -genesis-fork-version flags)")
 	}
-	log.Infof("Using genesis fork version: %s", genesisForkVersionHex)
+	log.Infof("using genesis fork version: %s", genesisForkVersionHex)
 
 	relays := parseRelayURLs(*relayURLs)
 	if len(relays) == 0 {
 		flag.Usage()
-		log.Fatal("No relays specified")
+		log.Fatal("no relays specified")
 	}
 	log.WithField("relays", relaysToStrings(relays)).Infof("using %d relays", len(relays))
 

diff --git a/server/service.go b/server/service.go
@@ -538,31 +538,29 @@ func (m *BoostService) CheckRelays() int {
 	var wg sync.WaitGroup
 	var numSuccessRequestsToRelay uint32
 
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
 	for _, r := range m.relays {
 		wg.Add(1)
 
 		go func(relay RelayEntry) {
 			defer wg.Done()
 			url := relay.GetURI(pathStatus)
 			log := m.log.WithField("url", url)
-			log.Debug("Checking relay status")
+			log.Debug("checking relay status")
 
-			code, err := SendHTTPRequest(ctx, m.httpClientGetHeader, http.MethodGet, url, "", nil, nil)
-			if err != nil && ctx.Err() != context.Canceled {
+			code, err := SendHTTPRequest(context.Background(), m.httpClientGetHeader, http.MethodGet, url, "", nil, nil)
+			if err != nil {
 				log.WithError(err).Error("relay status error - request failed")
 				return
 			}
-			if code != http.StatusOK {
+			if code == http.StatusOK {
+				log.Debug("relay status OK")
+			} else {
 				log.Errorf("relay status error - unexpected status code %d", code)
 				return
 			}
 
 			// Success: increase counter and cancel all pending requests to other relays
 			atomic.AddUint32(&numSuccessRequestsToRelay, 1)
-			cancel()
 		}(r)
 	}