From db67565d9778868eda6fc9f5a08c0666e370df29 Mon Sep 17 00:00:00 2001 From: naiba Date: Sat, 20 Mar 2021 14:53:10 +0800 Subject: [PATCH] fix: cycle wrapped IP information --- cmd/agent/main.go | 2 +- {service => cmd/agent}/monitor/monitor.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) rename {service => cmd/agent}/monitor/monitor.go (99%) diff --git a/cmd/agent/main.go b/cmd/agent/main.go index 96f3b37..163a664 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -20,11 +20,11 @@ import ( "github.com/p14yground/go-github-selfupdate/selfupdate" "google.golang.org/grpc" + "github.com/naiba/nezha/cmd/agent/monitor" "github.com/naiba/nezha/model" "github.com/naiba/nezha/pkg/utils" pb "github.com/naiba/nezha/proto" "github.com/naiba/nezha/service/dao" - "github.com/naiba/nezha/service/monitor" "github.com/naiba/nezha/service/rpc" ) diff --git a/service/monitor/monitor.go b/cmd/agent/monitor/monitor.go similarity index 99% rename from service/monitor/monitor.go rename to cmd/agent/monitor/monitor.go index 2a22b5f..5088c89 100644 --- a/service/monitor/monitor.go +++ b/cmd/agent/monitor/monitor.go @@ -25,7 +25,6 @@ type ipDotSbGeoIP struct { } var netInSpeed, netOutSpeed, netInTransfer, netOutTransfer, lastUpdate uint64 - var cachedIP, country string var latestFetchIP time.Time @@ -60,6 +59,8 @@ func GetHost() *model.Host { json.Unmarshal(body, &ip) cachedIP = ip.IP country = ip.CountryCode + } else { + cachedIP = "" } resp, err = http.Get("https://api-ipv6.ip.sb/geoip") if err == nil {