update

proxy/proxy.go

@@ -54,7 +54,6 @@ type Session struct {
 	login         string
 	worker        string
 	stratum       int
-	subscriptionID string
 	JobDeatils    jobDetails
 	Extranonce    string
 	ExtranonceSub bool
@@ -73,7 +72,7 @@ type jobDetails struct {
 
 func NewProxy(cfg *Config, backend *storage.RedisClient) *ProxyServer {
 	if len(cfg.Name) == 0 {
-		log.Fatal("You must set instance name")
+		log.Fatal("You must set the instance name")
 	}
 	policy := policy.Start(&cfg.Proxy.Policy, backend)
 
@@ -108,29 +107,19 @@ func NewProxy(cfg *Config, backend *storage.RedisClient) *ProxyServer {
 	stateUpdateTimer := time.NewTimer(stateUpdateIntv)
 
 	go func() {
-		for {
+		for range refreshTimer.C {
-			select {
-			case <-refreshTimer.C:
 			proxy.fetchBlockTemplate()
-				refreshTimer.Reset(refreshIntv)
-			}
 		}
 	}()
 
 	go func() {
-		for {
+		for range checkTimer.C {
-			select {
-			case <-checkTimer.C:
 			proxy.checkUpstreams()
-				checkTimer.Reset(checkIntv)
-			}
 		}
 	}()
 
 	go func() {
-		for {
+		for range stateUpdateTimer.C {
-			select {
-			case <-stateUpdateTimer.C:
 			t := proxy.currentBlockTemplate()
 			if t != nil {
 				rpc := proxy.rpc()
@@ -146,13 +135,13 @@ func NewProxy(cfg *Config, backend *storage.RedisClient) *ProxyServer {
 				if n > 0 {
 					prevblock, err := rpc.GetBlockByHeight(prev)
 					if err != nil || prevblock == nil {
-							log.Fatalf("Error while retrieving block from node: %v", err)
+						log.Fatalf("Error while retrieving block from the node: %v", err)
 					} else {
 						prevtime, _ := strconv.ParseInt(strings.Replace(prevblock.Timestamp, "0x", "", -1), 16, 64)
 						blocktime := float64(timestamp-prevtime) / float64(n)
 						err = backend.WriteNodeState(cfg.Name, t.Height, t.Difficulty, blocktime)
 						if err != nil {
-								log.Printf("Failed to write node state to backend: %v", err)
+							log.Printf("Failed to write node state to the backend: %v", err)
 							proxy.markSick()
 						} else {
 							proxy.markOk()
@@ -162,8 +151,6 @@ func NewProxy(cfg *Config, backend *storage.RedisClient) *ProxyServer {
 					proxy.markSick()
 				}
 			}
-				stateUpdateTimer.Reset(stateUpdateIntv)
-			}
 		}
 	}()