mirror of
https://github.com/gravitl/netmaker.git
synced 2025-10-30 11:46:28 +08:00
Updated to use logger.Log for PUBLIC_IP_SERVICE checks at verbosity of 3. Required some updates elsewhere to allowing using logger.Log from servercfg package.
This commit is contained in:
@@ -2,7 +2,6 @@ package servercfg
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"os"
|
||||
@@ -11,6 +10,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/gravitl/netmaker/config"
|
||||
"github.com/gravitl/netmaker/logger"
|
||||
"github.com/gravitl/netmaker/models"
|
||||
)
|
||||
|
||||
@@ -430,14 +430,14 @@ func GetPublicIP() (string, error) {
|
||||
iplist := []string{"https://ip.server.gravitl.com", "https://ifconfig.me", "https://api.ipify.org", "https://ipinfo.io/ip"}
|
||||
publicIpService := os.Getenv("PUBLIC_IP_SERVICE")
|
||||
if publicIpService != "" {
|
||||
fmt.Println("User provided public IP service is", publicIpService)
|
||||
logger.Log(3, "User provided public IP service is", publicIpService)
|
||||
|
||||
// prepend the user-specified service so it's checked first
|
||||
iplist = append([]string{publicIpService}, iplist...)
|
||||
}
|
||||
|
||||
for _, ipserver := range iplist {
|
||||
fmt.Println("Running public IP check with service", ipserver)
|
||||
logger.Log(3, "Running public IP check with service", ipserver)
|
||||
client := &http.Client{
|
||||
Timeout: time.Second * 10,
|
||||
}
|
||||
@@ -452,7 +452,7 @@ func GetPublicIP() (string, error) {
|
||||
continue
|
||||
}
|
||||
endpoint = string(bodyBytes)
|
||||
fmt.Println("Public IP address is", endpoint)
|
||||
logger.Log(3, "Public IP address is", endpoint)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user