Commit 35326659 authored by duanjinfei's avatar duanjinfei

update config

parent 08f920b4
...@@ -18,7 +18,6 @@ import ( ...@@ -18,7 +18,6 @@ import (
var ( var (
rewardAddr, dockerServer string rewardAddr, dockerServer string
isSetReward, isSetDockerServer bool
) )
func init() { func init() {
...@@ -33,23 +32,25 @@ var RootCmd = &cobra.Command{ ...@@ -33,23 +32,25 @@ var RootCmd = &cobra.Command{
Short: "The miner command-line interface", Short: "The miner command-line interface",
Long: ``, Long: ``,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
if rewardAddr != "" && dockerServer != "" { if rewardAddr == "" {
isSetDockerServer = conf.GetConfig().SetDockerServerUrl(dockerServer) log.Error("Enter reward address is not nil")
return
}
isSetDockerServer := conf.GetConfig().SetDockerServerUrl(dockerServer)
if !isSetDockerServer { if !isSetDockerServer {
log.Error("Enter right docker server address:", dockerServer) log.Error("Enter right docker server address:", dockerServer)
return
} }
log.Info("Enter docker server url:", dockerServer) log.Info("Enter docker server url:", dockerServer)
isSetReward = conf.GetConfig().SetRewardAddress(rewardAddr) isSetReward := conf.GetConfig().SetRewardAddress(rewardAddr)
if !isSetReward { if !isSetReward {
log.Error("Please set right reward address") log.Error("Please set right reward address")
return
} }
log.Info("Enter reward address:", rewardAddr) log.Info("Enter reward address:", rewardAddr)
}
if isSetReward && isSetDockerServer {
log.InitLog(log.LogConfig{Path: "logs", Level: "debug", Save: 3}) log.InitLog(log.LogConfig{Path: "logs", Level: "debug", Save: 3})
go nm.StartMonitor() go nm.StartMonitor()
beego.Run() beego.Run()
}
}, },
} }
......
...@@ -3,6 +3,7 @@ package conf ...@@ -3,6 +3,7 @@ package conf
import ( import (
"crypto/ecdsa" "crypto/ecdsa"
"example.com/m/log" "example.com/m/log"
"fmt"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"net/url" "net/url"
) )
...@@ -44,9 +45,9 @@ func (c *Config) SetRewardAddress(addr string) bool { ...@@ -44,9 +45,9 @@ func (c *Config) SetRewardAddress(addr string) bool {
} }
func (c *Config) SetDockerServerUrl(url string) bool { func (c *Config) SetDockerServerUrl(url string) bool {
isSuccess := checkDockerServer(url) isSuccess, newUrl := checkDockerServer(url)
if isSuccess { if isSuccess {
c.DockerServer = url c.DockerServer = newUrl
} }
return isSuccess return isSuccess
} }
...@@ -55,16 +56,28 @@ func (c *Config) SetNmSeed(seed string) { ...@@ -55,16 +56,28 @@ func (c *Config) SetNmSeed(seed string) {
c.NmSeed = seed c.NmSeed = seed
} }
func checkDockerServer(rawURL string) bool { func checkDockerServer(rawURL string) (bool, string) {
if rawURL == "" {
return true, fmt.Sprintf("tcp://%s:%s", "host.docker.internal", "2375")
}
parsedURL, err := url.Parse(rawURL) parsedURL, err := url.Parse(rawURL)
if err != nil { if err != nil {
log.Error("Error parsing URL:", err) log.Error("Error parsing URL:", err)
return false return false, ""
} }
// 提取协议、主机和端口信息 // 提取协议、主机和端口信息
protocol := parsedURL.Scheme protocol := parsedURL.Scheme
if protocol != "tcp" { if parsedURL.Scheme != "" && protocol != "tcp" {
return false return false, ""
}
ip := "host.docker.internal"
port := "2375"
if parsedURL.Port() != "" {
port = parsedURL.Port()
}
if parsedURL.Host != "" {
ip = parsedURL.Host
} }
return true newUrl := fmt.Sprintf("tcp://%s:%s", ip, port)
return true, newUrl
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment