From 8571f350316a991ca48e28374d4ef6e66888bd95 Mon Sep 17 00:00:00 2001
From: i-norden <iansnorden@gmail.com>
Date: Mon, 25 Oct 2021 14:54:55 -0500
Subject: [PATCH] fixes

---
 cmd/util.go      | 2 +-
 pkg/prom/prom.go | 8 +++-----
 pkg/service.go   | 3 ++-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cmd/util.go b/cmd/util.go
index 374f4f5..b55e5cd 100644
--- a/cmd/util.go
+++ b/cmd/util.go
@@ -107,8 +107,8 @@ func setupPreRunRanges() []sd.RangeRequest {
 	}
 	preRunParams.WatchedStorageSlots = keys
 	var rawRanges []blockRange
-	blockRanges := make([]sd.RangeRequest, len(rawRanges))
 	viper.UnmarshalKey("prerun.ranges", &rawRanges)
+	blockRanges := make([]sd.RangeRequest, len(rawRanges))
 	for i, rawRange := range rawRanges {
 		blockRanges[i] = sd.RangeRequest{
 			Start:  rawRange[0],
diff --git a/pkg/prom/prom.go b/pkg/prom/prom.go
index 2df6f6a..5ad7199 100644
--- a/pkg/prom/prom.go
+++ b/pkg/prom/prom.go
@@ -29,8 +29,7 @@ const statsSubsystem = "stats"
 var (
 	metrics bool
 
-	queuedRanges prometheus.Counter
-
+	queuedRanges        prometheus.Gauge
 	lastLoadedHeight    prometheus.Gauge
 	lastProcessedHeight prometheus.Gauge
 
@@ -54,12 +53,11 @@ const (
 func Init() {
 	metrics = true
 
-	queuedRanges = promauto.NewCounter(prometheus.CounterOpts{
+	queuedRanges = promauto.NewGauge(prometheus.GaugeOpts{
 		Namespace: namespace,
 		Name:      RANGES_QUEUED,
 		Help:      "Number of range requests currently queued",
 	})
-
 	lastLoadedHeight = promauto.NewGauge(prometheus.GaugeOpts{
 		Namespace: namespace,
 		Name:      LOADED_HEIGHT,
@@ -114,7 +112,7 @@ func IncQueuedRanges() {
 // DecQueuedRanges decrements the number of queued range requests
 func DecQueuedRanges() {
 	if metrics {
-		queuedRanges.Add(-1)
+		queuedRanges.Dec()
 	}
 }
 
diff --git a/pkg/service.go b/pkg/service.go
index bb3226a..b176a2f 100644
--- a/pkg/service.go
+++ b/pkg/service.go
@@ -129,7 +129,7 @@ func (sds *Service) Loop(wg *sync.WaitGroup) error {
 				select {
 				case blockRange := <-sds.queue:
 					prom.DecQueuedRanges()
-					for j := blockRange.Start; j <= blockRange.Start; j++ {
+					for j := blockRange.Start; j <= blockRange.Stop; j++ {
 						if err := sds.WriteStateDiffAt(j, blockRange.Params); err != nil {
 							logrus.Errorf("service worker %d error writing statediff at height %d in range (%d, %d) : %v", id, j, blockRange.Start, blockRange.Stop, err)
 						}
@@ -143,6 +143,7 @@ func (sds *Service) Loop(wg *sync.WaitGroup) error {
 							logrus.Infof("service worker %d finished processing statediff height %d in range (%d, %d)", id, j, blockRange.Start, blockRange.Stop)
 						}
 					}
+					logrus.Infof("service worker %d finished processing range (%d, %d)", id, blockRange.Start, blockRange.Stop)
 				case <-sds.quitChan:
 					logrus.Infof("closing the statediff service loop worker %d", id)
 					return