From eebd6500f3c866d407ec8b963855d39aec5ab026 Mon Sep 17 00:00:00 2001 From: liangzy Date: Mon, 4 May 2020 11:11:11 +0800 Subject: [PATCH] fix hardward addr bug --- logs/es/es.go | 2 +- logs/es/sys.go | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/logs/es/es.go b/logs/es/es.go index a5e2ceb..d017282 100644 --- a/logs/es/es.go +++ b/logs/es/es.go @@ -80,7 +80,7 @@ func (el *esLogger) WriteMsg(when time.Time, msg string, level int, lable string vals["hostname"] = GetHostname() vals["working_idr"] = Getwd() vals["home_dir"] = GetUserHomename() - vals["hardware_addr"] = GetCurrentInterface().HardwareAddr + vals["hardware_addr"] = GetCurrentInterfaceHardwareAddr() vals["client_addrs"] = GetCurrentInterfaceAddrs() if el.IndexName == "" { diff --git a/logs/es/sys.go b/logs/es/sys.go index ddd4eec..0d4441e 100644 --- a/logs/es/sys.go +++ b/logs/es/sys.go @@ -15,6 +15,13 @@ func GetCurrentInterface() *net.Interface { return nil } +func GetCurrentInterfaceHardwareAddr() string { + if inter := GetCurrentInterface(); inter != nil { + return fmt.Sprintf("%s", inter.HardwareAddr) + } + return "" +} + func GetCurrentInterfaceAddrs() string { if inter := GetCurrentInterface(); inter != nil { if addrs, err := inter.Addrs(); err == nil {