CovenantSQL · leventeliu · May 30, 2019 · May 29, 2019 · May 30, 2019 · May 30, 2019
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/cmd/cql-minerd/disk_usage.go b/cmd/cql-minerd/disk_usage.go
@@ -24,12 +24,14 @@ import (
 	"strconv"
 	"strings"
 
+	mw "github.com/zserge/metric"
+
 	"github.com/CovenantSQL/CovenantSQL/conf"
 	"github.com/CovenantSQL/CovenantSQL/utils/log"
 )
 
 var (
-	diskUsageMetric = expvar.NewInt("service:miner:disk:usage")
+	diskUsageMetric = mw.NewGauge("5m1m")
 )
 
 func collectDiskUsage() (err error) {
@@ -62,15 +64,15 @@ func collectDiskUsage() (err error) {
 		return
 	}
 
-	err = cmd.Wait()
+	duResult, err := ioutil.ReadAll(duOutput)
 	if err != nil {
-		log.WithError(err).Error("run disk usage command failed")
+		log.WithError(err).Error("get disk usage result failed")
 		return
 	}
 
-	duResult, err := ioutil.ReadAll(duOutput)
+	err = cmd.Wait()
 	if err != nil {
-		log.WithError(err).Error("get disk usage result failed")
+		log.WithError(err).Error("run disk usage command failed")
 		return
 	}
 
@@ -86,7 +88,11 @@ func collectDiskUsage() (err error) {
 		return
 	}
 
-	diskUsageMetric.Set(usedKiloBytes)
+	diskUsageMetric.Add(float64(usedKiloBytes))
 
 	return
 }
+
+func init() {
+	expvar.Publish("service:miner:disk:usage", diskUsageMetric)
+}
diff --git a/cmd/cql-minerd/node.go b/cmd/cql-minerd/node.go
@@ -34,10 +34,11 @@ import (
 )
 
 const (
-	mwMinerAddr     = "service:miner:addr"
-	mwMinerNodeID   = "service:miner:node"
-	mwMinerWallet   = "service:miner:wallet"
-	mwMinerDiskRoot = "service:miner:disk:root"
+	mwMinerAddr         = "service:miner:addr"
+	mwMinerExternalAddr = "service:miner:addr:external"
+	mwMinerNodeID       = "service:miner:node"
+	mwMinerWallet       = "service:miner:wallet"
+	mwMinerDiskRoot     = "service:miner:disk:root"
 )
 
 func initNode() (server *mux.Server, direct *rpc.Server, err error) {
@@ -101,6 +102,7 @@ func createDirectServer(privateKeyPath string, masterKey []byte, listenAddr stri
 func initMetrics() {
 	if conf.GConf != nil {
 		expvar.NewString(mwMinerAddr).Set(conf.GConf.ListenAddr)
+		expvar.NewString(mwMinerExternalAddr).Set(conf.GConf.ExternalListenAddr)
 		expvar.NewString(mwMinerNodeID).Set(string(conf.GConf.ThisNodeID))
 		expvar.NewString(mwMinerWallet).Set(conf.GConf.WalletAddress)
 

diff --git a/conf/config.go b/conf/config.go
@@ -114,15 +114,16 @@ type Config struct {
 	StartupSyncHoles bool `yaml:"StartupSyncHoles,omitempty"`
 	GenerateKeyPair  bool `yaml:"-"`
 	//TODO(auxten): set yaml key for config
-	WorkingRoot      string            `yaml:"WorkingRoot"`
-	PubKeyStoreFile  string            `yaml:"PubKeyStoreFile"`
-	PrivateKeyFile   string            `yaml:"PrivateKeyFile"`
-	WalletAddress    string            `yaml:"WalletAddress"`
-	DHTFileName      string            `yaml:"DHTFileName"`
-	ListenAddr       string            `yaml:"ListenAddr"`
-	ListenDirectAddr string            `yaml:"ListenDirectAddr",omitempty`
-	ThisNodeID       proto.NodeID      `yaml:"ThisNodeID"`
-	ValidDNSKeys     map[string]string `yaml:"ValidDNSKeys"` // map[DNSKEY]domain
+	WorkingRoot        string            `yaml:"WorkingRoot"`
+	PubKeyStoreFile    string            `yaml:"PubKeyStoreFile"`
+	PrivateKeyFile     string            `yaml:"PrivateKeyFile"`
+	WalletAddress      string            `yaml:"WalletAddress"`
+	DHTFileName        string            `yaml:"DHTFileName"`
+	ListenAddr         string            `yaml:"ListenAddr"`
+	ListenDirectAddr   string            `yaml:"ListenDirectAddr,omitempty"`
+	ExternalListenAddr string            `yaml:"-"` // for metric purpose
+	ThisNodeID         proto.NodeID      `yaml:"ThisNodeID"`
+	ValidDNSKeys       map[string]string `yaml:"ValidDNSKeys"` // map[DNSKEY]domain
 	// Check By BP DHT.Ping
 	MinNodeIDDifficulty int `yaml:"MinNodeIDDifficulty"`
 
@@ -206,10 +207,10 @@ func LoadConfig(configPath string) (config *Config, err error) {
 		config.Miner.RootDir = path.Join(configDir, config.Miner.RootDir)
 	}
 
-	if config.WalletAddress != "" {
+	if len(config.KnownNodes) > 0 {
 		for _, node := range config.KnownNodes {
 			if node.ID == config.ThisNodeID {
-				if node.PublicKey != nil {
+				if config.WalletAddress == "" && node.PublicKey != nil {
 					var walletHash proto.AccountAddress
 
 					if walletHash, err = crypto.PubKeyHash(node.PublicKey); err != nil {
@@ -218,6 +219,12 @@ func LoadConfig(configPath string) (config *Config, err error) {
 
 					config.WalletAddress = walletHash.String()
 				}
+
+				if config.ExternalListenAddr == "" {
+					config.ExternalListenAddr = node.Addr
+				}
+
+				break
 			}
 		}
 	}

diff --git a/proto/nodeinfo.go b/proto/nodeinfo.go
@@ -114,7 +114,7 @@ type Node struct {
 	ID         NodeID                `yaml:"ID"`
 	Role       ServerRole            `yaml:"Role"`
 	Addr       string                `yaml:"Addr"`
-	DirectAddr string                `yaml:"DirectAddr",omitempty`
+	DirectAddr string                `yaml:"DirectAddr,omitempty"`
 	PublicKey  *asymmetric.PublicKey `yaml:"PublicKey"`
 	Nonce      mine.Uint256          `yaml:"Nonce"`
 }

diff --git a/sqlchain/chain.go b/sqlchain/chain.go
@@ -53,7 +53,6 @@ const (
 	mwMinerChainBlockHeight    = "head:height"
 	mwMinerChainBlockHash      = "head:hash"
 	mwMinerChainBlockTimestamp = "head:timestamp"
-	mwMinerChainRequestsFreq   = "requests:freq"
 	mwMinerChainRequestsCount  = "requests:count"
 )
 
@@ -221,7 +220,6 @@ func NewChainWithContext(ctx context.Context, c *Config) (chain *Chain, err erro
 	chain.expVars.Set(mwMinerChainBlockHeight, new(expvar.Int))
 	chain.expVars.Set(mwMinerChainBlockHash, new(expvar.String))
 	chain.expVars.Set(mwMinerChainBlockTimestamp, new(expvar.String))
-	chain.expVars.Set(mwMinerChainRequestsFreq, mw.NewGauge("5m1m"))
 	chain.expVars.Set(mwMinerChainRequestsCount, mw.NewCounter("5m1m"))
 
 	chainVars.Set(string(c.DatabaseID), chain.expVars)
@@ -966,7 +964,6 @@ func (c *Chain) Query(
 	// cancelling will be propagated to this context before chain instance stops.
 	// update metrics
 	c.expVars.Get(mwMinerChainRequestsCount).(mw.Metric).Add(1)
-	c.expVars.Get(mwMinerChainRequestsFreq).(mw.Metric).Add(1)
 
 	return c.st.QueryWithContext(req.GetContext(), req, isLeader)
 }

diff --git a/vendor/github.com/CovenantSQL/beacon/README.md b/vendor/github.com/CovenantSQL/beacon/README.md
diff --git a/vendor/github.com/CovenantSQL/beacon/dns.png b/vendor/github.com/CovenantSQL/beacon/dns.png
diff --git a/vendor/github.com/CovenantSQL/beacon/main.go b/vendor/github.com/CovenantSQL/beacon/main.go