From 7b8ef8e85b7368a21d95a4b8cb7dee720d855102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Thu, 16 Sep 2021 15:58:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8A=A0=E8=BD=BD=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E5=90=8E=E6=89=8D=E5=90=AF=E5=8A=A8=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/iplibrary/manager_country.go | 4 ++-- internal/iplibrary/manager_ip_list.go | 4 ++-- internal/iplibrary/manager_province.go | 4 ++-- internal/monitor/value_queue.go | 2 +- internal/nodes/node.go | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/iplibrary/manager_country.go b/internal/iplibrary/manager_country.go index 6411bef..1b4eada 100644 --- a/internal/iplibrary/manager_country.go +++ b/internal/iplibrary/manager_country.go @@ -20,12 +20,12 @@ import ( var SharedCountryManager = NewCountryManager() func init() { - events.On(events.EventStart, func() { + events.On(events.EventLoaded, func() { go SharedCountryManager.Start() }) } -// 国家信息管理 +// CountryManager 国家/地区信息管理 type CountryManager struct { cacheFile string diff --git a/internal/iplibrary/manager_ip_list.go b/internal/iplibrary/manager_ip_list.go index e3f97b0..2875126 100644 --- a/internal/iplibrary/manager_ip_list.go +++ b/internal/iplibrary/manager_ip_list.go @@ -15,12 +15,12 @@ var SharedIPListManager = NewIPListManager() var IPListUpdateNotify = make(chan bool, 1) func init() { - events.On(events.EventStart, func() { + events.On(events.EventLoaded, func() { go SharedIPListManager.Start() }) } -// IP名单管理 +// IPListManager IP名单管理 type IPListManager struct { // 缓存文件 // 每行一个数据:id|from|to|expiredAt diff --git a/internal/iplibrary/manager_province.go b/internal/iplibrary/manager_province.go index fae475b..df0410a 100644 --- a/internal/iplibrary/manager_province.go +++ b/internal/iplibrary/manager_province.go @@ -24,12 +24,12 @@ const ( var SharedProvinceManager = NewProvinceManager() func init() { - events.On(events.EventStart, func() { + events.On(events.EventLoaded, func() { go SharedProvinceManager.Start() }) } -// 国家信息管理 +// ProvinceManager 中国省份信息管理 type ProvinceManager struct { cacheFile string diff --git a/internal/monitor/value_queue.go b/internal/monitor/value_queue.go index d4a6d07..3f1b4c1 100644 --- a/internal/monitor/value_queue.go +++ b/internal/monitor/value_queue.go @@ -15,7 +15,7 @@ import ( var SharedValueQueue = NewValueQueue() func init() { - events.On(events.EventStart, func() { + events.On(events.EventLoaded, func() { go SharedValueQueue.Start() }) } diff --git a/internal/nodes/node.go b/internal/nodes/node.go index b36b095..ba84065 100644 --- a/internal/nodes/node.go +++ b/internal/nodes/node.go @@ -290,7 +290,7 @@ func (this *Node) syncConfig() error { if os.IsNotExist(clusterErr) { return err } - return clusterErr + return errors.New("check cluster config failed: " + clusterErr.Error()) } } else { return err @@ -347,7 +347,7 @@ func (this *Node) syncConfig() error { } else { remotelogs.Println("NODE", "loading config ...") } - + nodeconfigs.ResetNodeConfig(nodeConfig) caches.SharedManager.MaxDiskCapacity = nodeConfig.MaxCacheDiskCapacity caches.SharedManager.MaxMemoryCapacity = nodeConfig.MaxCacheMemoryCapacity @@ -425,7 +425,7 @@ func (this *Node) checkClusterConfig() error { return err } - logs.Println("[NODE]registering node ...") + logs.Println("[NODE]registering node to cluster ...") resp, err := rpcClient.NodeRPC().RegisterClusterNode(rpcClient.ClusterContext(config.ClusterId, config.Secret), &pb.RegisterClusterNodeRequest{Name: HOSTNAME}) if err != nil { return err