mirrors/node-feature-discovery
mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2025-03-17 05:48:21 +00:00
Code Activity

Drop glog based logging

Browse source 
Simplify logging of feature sources. Glog was used in some feature
sources, but, it was too complicated for the simple logging needs of
NFD.
This commit is contained in:
Markus Lehtonen 2018-07-20 11:15:18 +03:00
parent de94376a09
commit 0c8fe34163
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/network/network.go
View file

@ -19,8 +19,8 @@ package network
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/golang/glog"
"io/ioutil" "io/ioutil"
"log"
"net" "net"
"strconv" "strconv"
"strings" "strings"
@ -47,37 +47,37 @@ func (s Source) Discover() (source.Features, error) {
totalVfsPath := "/sys/class/net/" + netInterface.Name + "/device/sriov_totalvfs" totalVfsPath := "/sys/class/net/" + netInterface.Name + "/device/sriov_totalvfs"
totalBytes, err := ioutil.ReadFile(totalVfsPath) totalBytes, err := ioutil.ReadFile(totalVfsPath)
if err != nil { if err != nil {
glog.Errorf("SR-IOV not supported for network interface: %s: %v", netInterface.Name, err) log.Printf("SR-IOV not supported for network interface: %s: %v", netInterface.Name, err)
continue continue
} }
total := bytes.TrimSpace(totalBytes) total := bytes.TrimSpace(totalBytes)
t, err := strconv.Atoi(string(total)) t, err := strconv.Atoi(string(total))
if err != nil { if err != nil {
glog.Errorf("Error in obtaining maximum supported number of virtual functions for network interface: %s: %v", netInterface.Name, err) log.Printf("Error in obtaining maximum supported number of virtual functions for network interface: %s: %v", netInterface.Name, err)
continue continue
} }
if t > 0 { if t > 0 {
glog.Infof("SR-IOV capability is detected on the network interface: %s", netInterface.Name) log.Printf("SR-IOV capability is detected on the network interface: %s", netInterface.Name)
glog.Infof("%d maximum supported number of virtual functions on network interface: %s", t, netInterface.Name) log.Printf("%d maximum supported number of virtual functions on network interface: %s", t, netInterface.Name)
features["sriov.capable"] = true features["sriov.capable"] = true
numVfsPath := "/sys/class/net/" + netInterface.Name + "/device/sriov_numvfs" numVfsPath := "/sys/class/net/" + netInterface.Name + "/device/sriov_numvfs"
numBytes, err := ioutil.ReadFile(numVfsPath) numBytes, err := ioutil.ReadFile(numVfsPath)
if err != nil { if err != nil {
glog.Errorf("SR-IOV not configured for network interface: %s: %s", netInterface.Name, err) log.Printf("SR-IOV not configured for network interface: %s: %s", netInterface.Name, err)
continue continue
} }
num := bytes.TrimSpace(numBytes) num := bytes.TrimSpace(numBytes)
n, err := strconv.Atoi(string(num)) n, err := strconv.Atoi(string(num))
if err != nil { if err != nil {
glog.Errorf("Error in obtaining the configured number of virtual functions for network interface: %s: %v", netInterface.Name, err) log.Printf("Error in obtaining the configured number of virtual functions for network interface: %s: %v", netInterface.Name, err)
continue continue
} }
if n > 0 { if n > 0 {
glog.Infof("%d virtual functions configured on network interface: %s", n, netInterface.Name) log.Printf("%d virtual functions configured on network interface: %s", n, netInterface.Name)
features["sriov.configured"] = true features["sriov.configured"] = true
break break
} else if n == 0 { } else if n == 0 {
glog.Errorf("SR-IOV not configured on network interface: %s", netInterface.Name) log.Printf("SR-IOV not configured on network interface: %s", netInterface.Name)
} }
} }
} }