Commit c31bca79 authored by duanjinfei's avatar duanjinfei

update config setting

parent dc98f18f
...@@ -17,12 +17,13 @@ import ( ...@@ -17,12 +17,13 @@ import (
) )
var ( var (
rewardAddr string rewardAddr, dockerServer string
isSetReward bool = false isSetReward, isSetDockerServer bool
) )
func init() { func init() {
RootCmd.PersistentFlags().StringVarP(&rewardAddr, "reward", "r", "", "please enter a reward address") RootCmd.PersistentFlags().StringVarP(&rewardAddr, "reward", "r", "", "please enter a reward address")
RootCmd.PersistentFlags().StringVarP(&dockerServer, "docker_server", "d", "", "please enter docker server address")
cobra.OnInitialize(initConfig) cobra.OnInitialize(initConfig)
} }
...@@ -32,14 +33,19 @@ var RootCmd = &cobra.Command{ ...@@ -32,14 +33,19 @@ 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 != "" { if rewardAddr != "" && dockerServer != "" {
log.Info("Enter reward address:", rewardAddr) isSetDockerServer = conf.GetConfig().SetDockerServerUrl(dockerServer)
if !isSetDockerServer {
log.Error("Enter right docker server address:", 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")
} }
log.Info("Enter reward address:", rewardAddr)
} }
if isSetReward { 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()
......
...@@ -2,20 +2,22 @@ package conf ...@@ -2,20 +2,22 @@ package conf
import ( import (
"crypto/ecdsa" "crypto/ecdsa"
"example.com/m/log"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"net/url"
) )
type Config struct { type Config struct {
NmSeed string `json:"nm_seed"`
SignPrv string SignPrv string
SignPrivateKey *ecdsa.PrivateKey
SignPub string SignPub string
DockerServer string
BenefitAddress string
HeartRespTimeMillis int64
SignPublicAddress common.Address SignPublicAddress common.Address
DockerServer string `json:"docker_server"` SignPrivateKey *ecdsa.PrivateKey
NmSeed string `json:"nm_seed"`
HeartRespTimeSecond int64 `json:"heart_response"` HeartRespTimeSecond int64 `json:"heart_response"`
HeartRespTimeMillis int64
TaskValidatorTime float64 `json:"task_validator_time"` TaskValidatorTime float64 `json:"task_validator_time"`
BenefitAddress string
ContainerNum int64 `json:"container_num"` ContainerNum int64 `json:"container_num"`
NodeManagerNum int64 `json:"node_manager_num"` NodeManagerNum int64 `json:"node_manager_num"`
ChainID int64 `json:"chain_id"` ChainID int64 `json:"chain_id"`
...@@ -41,6 +43,28 @@ func (c *Config) SetRewardAddress(addr string) bool { ...@@ -41,6 +43,28 @@ func (c *Config) SetRewardAddress(addr string) bool {
return isAddr return isAddr
} }
func (c *Config) SetDockerServerUrl(url string) bool {
isSuccess := checkDockerServer(url)
if isSuccess {
c.DockerServer = url
}
return isSuccess
}
func (c *Config) SetNmSeed(seed string) { func (c *Config) SetNmSeed(seed string) {
c.NmSeed = seed c.NmSeed = seed
} }
func checkDockerServer(rawURL string) bool {
parsedURL, err := url.Parse(rawURL)
if err != nil {
log.Error("Error parsing URL:", err)
return false
}
// 提取协议、主机和端口信息
protocol := parsedURL.Scheme
if protocol != "tcp" {
return false
}
return true
}
{ {
"nm_seed": "43.198.252.255:10001", "nm_seed": "43.198.252.255:10001",
"docker_server": "tcp://127.0.0.1:2375", "api_url": "https://console.aigic.ai/api/task/taskheat",
"api_url": "http://43.198.252.255:8087/api/task/taskheat",
"node_manager_num": 1, "node_manager_num": 1,
"heart_response": 30, "heart_response": 30,
"task_validator_time": 1, "task_validator_time": 1,
......
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