From 5b6a8b299d6393b9941bb40c18aa53f249477841 Mon Sep 17 00:00:00 2001 From: litao Date: Sun, 13 Aug 2017 20:10:24 +0800 Subject: [PATCH 1/2] [agent] support get agent endpoint from ENV ENDPOINT --- modules/agent/g/cfg.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/agent/g/cfg.go b/modules/agent/g/cfg.go index 03cc4afd4..ec9ddce81 100644 --- a/modules/agent/g/cfg.go +++ b/modules/agent/g/cfg.go @@ -72,6 +72,11 @@ func Hostname() (string, error) { return hostname, nil } + if os.Getenv("ENDPOINT") != "" { + hostname = os.Getenv("ENDPOINT") + return hostname, nil + } + hostname, err := os.Hostname() if err != nil { log.Println("ERROR: os.Hostname() fail", err) From d038b7daf3a3c4629980aaea243bd3c91edbd26e Mon Sep 17 00:00:00 2001 From: laiwei Date: Tue, 15 Aug 2017 18:39:10 +0800 Subject: [PATCH 2/2] rename env to FALCON_ENDPOINT from ENDPOINT --- modules/agent/g/cfg.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/agent/g/cfg.go b/modules/agent/g/cfg.go index ec9ddce81..c3e01818b 100644 --- a/modules/agent/g/cfg.go +++ b/modules/agent/g/cfg.go @@ -72,8 +72,8 @@ func Hostname() (string, error) { return hostname, nil } - if os.Getenv("ENDPOINT") != "" { - hostname = os.Getenv("ENDPOINT") + if os.Getenv("FALCON_ENDPOINT") != "" { + hostname = os.Getenv("FALCON_ENDPOINT") return hostname, nil }