From e525ac65feb894df31700d9988139ddb8e645b1a Mon Sep 17 00:00:00 2001 From: jay Date: Wed, 26 Sep 2018 19:42:38 +0800 Subject: [PATCH] remove lock, change run one time --- config.default.yml | 1 - main.go | 35 +++-------------------------------- modules/setting.go | 1 - 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/config.default.yml b/config.default.yml index f1bd0d4..6531bbc 100644 --- a/config.default.yml +++ b/config.default.yml @@ -1,4 +1,3 @@ -interface: eth0 domains: - name: domain.name subdomain: diff --git a/main.go b/main.go index cf78907..b8bb8f1 100644 --- a/main.go +++ b/main.go @@ -5,10 +5,8 @@ import ( "fmt" "io/ioutil" "log" - "net" "net/http" "regexp" - "time" "git.trj.tw/golang/go-aws-dns/modules" @@ -44,31 +42,12 @@ func main() { config = setting.LoadConfig(confpath) fmt.Println(config) - // wait nic - for { - nics, err := net.Interfaces() - if err != nil { - log.Fatal(err) - } - nicFlag := false - for _, v := range nics { - if v.Name == config.NIC { - nicFlag = true - } - } - if nicFlag == true { - break - } - time.Sleep(time.Second * 5) - } - ip = getMyIP() if ok, err := checkIP(ip); err != nil || !ok { println("ip check fail") checkErr(err) } println(ip) - mainLoc := make(chan bool) var tmp []string for _, it := range config.Domains { @@ -100,18 +79,10 @@ func main() { fmt.Println(domains[0]) - go func() { - for { - println("run loop") - for _, it := range domains { - it.updateRecord() - } + for _, it := range domains { + it.updateRecord() + } - time.Sleep(time.Minute * 5) - } - }() - - <-mainLoc } func newR53() { diff --git a/modules/setting.go b/modules/setting.go index 3ad138d..b86f9de 100644 --- a/modules/setting.go +++ b/modules/setting.go @@ -11,7 +11,6 @@ import ( ) type Config struct { - NIC string `yaml:"interface"` Domains []struct { Name string `yaml:"name"` Sub []string `yaml:"subdomain,flow"`