v0.3.1

Author: wlsaud619

config/config.go

@@ -2,12 +2,10 @@ package config
 
 import (
 	"log"
-//	"time"
 
 	"github.com/BurntSushi/toml"
 	rpc "github.com/node-a-team/terra-validator_exporter/getData/rpc"
 	rest "github.com/node-a-team/terra-validator_exporter/getData/rest"
-//	"github.com/spf13/viper"
 )
 
 const (
@@ -40,7 +38,7 @@ type configType struct {
 }
 
 
-func Init() {
+func Init() string {
 
 	Config = readConfig()
 
@@ -49,15 +47,13 @@ func Init() {
 
 	rest.OperAddr = Config.Validator.OperatorAddr
 
+	return Config.Options.ListenPort
 }
 
 func readConfig() configType {
 
         var config configType
 
-//	path := viper.GetString(ConfigPath)+"/config.toml"
-
-//        if _, err := toml.DecodeFile(path, &config); err != nil{
         if _, err := toml.DecodeFile(ConfigPath +"/config.toml", &config); err != nil{
 
                 log.Fatal("Config file is missing: ", config)

exporter/metric/address.go

@@ -3,12 +3,7 @@ package metric
 import (
 
 	"fmt"
-//	"encoding/hex"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-
-//	"github.com/node-a-team/terra-validator_exporter/getData"
-//	cfg "github.com/node-a-team/terra-validator_exporter/config"
-//	utils "github.com/node-a-team/terra-validator_exporter/utils"
 )
 
 var (

exporter/metric/metric.go

@@ -2,12 +2,8 @@ package metric
 
 import (
 
-//	"fmt"
-//	"encoding/hex"
-//	sdk "github.com/cosmos/cosmos-sdk/types"
 	"go.uber.org/zap"
 
-//	"github.com/node-a-team/terra-validator_exporter/getData"
 	rest "github.com/node-a-team/terra-validator_exporter/getData/rest"
 	rpc "github.com/node-a-team/terra-validator_exporter/getData/rpc"
 	cfg "github.com/node-a-team/terra-validator_exporter/config"
@@ -121,7 +117,6 @@ func SetMetric(currentBlock int64, restData *rest.RESTData, rpcData *rpc.RPCData
 	consAddr := restData.Validatorsets[consPubKey][0]
 
 	//// network
-
 	metricData.Network.ChainID = rpcData.Commit.ChainId
         metricData.Network.BlockHeight = currentBlock
 

exporter/metric/types.go

@@ -2,10 +2,6 @@ package metric
 
 import (
 
-//	"fmt"
-//	"encoding/hex"
-//	sdk "github.com/cosmos/cosmos-sdk/types"
-
 	"github.com/prometheus/client_golang/prometheus"
 )
 

getData/prometheus/prometheus.go

@@ -1,7 +1,6 @@
 package rest
 
 import (
-//        "fmt"
 	"strings"
 	"go.uber.org/zap"
 	"encoding/json"

getData/rest/balances.go

@@ -63,7 +63,6 @@ func GetData(blockHeight int64, log *zap.Logger) (*RESTData, string) {
 func runRESTCommand(str string) ([]uint8, error) {
         cmd := "curl -s -XGET " +Addr +str +" -H \"accept:application/json\""
         out, err := exec.Command("/bin/bash", "-c", cmd).Output()
-//	fmt.Println(cmd)
 
         return out, err
 }

getData/rest/rest.go

@@ -26,14 +26,16 @@ func getStakingPool(log *zap.Logger) stakingPool {
 
 	var sp stakingPool
 
-	res, _ := runRESTCommand("/staking/pool")
+	res, err := runRESTCommand("/staking/pool")
 	json.Unmarshal(res, &sp)
 
 	// log 
 	if strings.Contains(string(res), "not found") {
                 // handle error
                 log.Fatal("REST-Server", zap.Bool("Success", false), zap.String("err", string(res),))
-        } else {
+	} else if err != nil {
+                log.Fatal("REST-Server", zap.Bool("Success", false), zap.String("err", "Failed to connect to REST-Server"),)
+	} else {
                 log.Info("REST-Server", zap.Bool("Success", true), zap.String("err", "nil"), zap.String("Get Data", "Staking Pool"),)
         }
 

getData/rest/stakingPool.go

@@ -48,7 +48,7 @@ func getValidators(log *zap.Logger) validator {
         if strings.Contains(string(res), "not found") {
                 // handle error
                 log.Fatal("REST-Server", zap.Bool("Success", false), zap.String("err", string(res),))
-        } else {
+	} else {
                 log.Info("REST-Server", zap.Bool("Success", true), zap.String("err", "nil"), zap.String("Get Data", "Validators"),)
         }
 

getData/rest/validators.go

@@ -20,8 +20,6 @@ var ()
 
 func main() {
 
-	port := "26661"
-
 	log,_ := zap.NewDevelopment()
         defer log.Sync()
 
@@ -36,7 +34,7 @@ func main() {
 
 	cfg.ConfigPath = os.Args[1]
 
-	cfg.Init()
+	port := cfg.Init()
 	rpc.OpenSocket(log)
 
 	http.Handle("/metrics", promhttp.Handler())
@@ -51,5 +49,4 @@ func main() {
 		log.Info("HTTP Handle", zap.Bool("Success", true), zap.String("err", "nil"), zap.String("Listen&Serve", "Prometheus Handler(Port: " +port +")"),)
         }
 
-//	utils.Log(err, "Http Handle", "", "")
 }