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-05 16:27:05 +00:00
Code Activity

Use standard logger for all feature sources

Browse source
This commit is contained in:
Markus Lehtonen 2018-12-04 16:30:30 +02:00
parent 0c8fe34163
commit d4cb0e742b
3 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/kernel/kernel.go
View file

@ -34,8 +34,6 @@ type NFDConfig struct {
ConfigOpts []string `json:"configOpts,omitempty"` ConfigOpts []string `json:"configOpts,omitempty"`
} }
var logger = log.New(os.Stderr, "", log.LstdFlags)
var Config = NFDConfig{ var Config = NFDConfig{
KconfigFile: "", KconfigFile: "",
ConfigOpts: []string{ ConfigOpts: []string{
@ -57,7 +55,7 @@ func (s Source) Discover() (source.Features, error) {
// Read kernel version // Read kernel version
version, err := parseVersion() version, err := parseVersion()
if err != nil { if err != nil {
logger.Printf("ERROR: Failed to get kernel version: %s", err) log.Printf("ERROR: Failed to get kernel version: %s", err)
} else { } else {
for key := range version { for key := range version {
features["version."+key] = version[key] features["version."+key] = version[key]
@ -67,7 +65,7 @@ func (s Source) Discover() (source.Features, error) {
// Read kconfig // Read kconfig
kconfig, err := parseKconfig() kconfig, err := parseKconfig()
if err != nil { if err != nil {
logger.Printf("ERROR: Failed to read kconfig: %s", err) log.Printf("ERROR: Failed to read kconfig: %s", err)
} }
// Check flags // Check flags
@ -79,7 +77,7 @@ func (s Source) Discover() (source.Features, error) {
selinux, err := SelinuxEnabled() selinux, err := SelinuxEnabled()
if err != nil { if err != nil {
logger.Print(err) log.Print(err)
} else if selinux { } else if selinux {
features["selinux.enabled"] = true features["selinux.enabled"] = true
} }
@ -142,7 +140,7 @@ func parseKconfig() (map[string]bool, error) {
if len(Config.KconfigFile) > 0 { if len(Config.KconfigFile) > 0 {
raw, err = ioutil.ReadFile(Config.KconfigFile) raw, err = ioutil.ReadFile(Config.KconfigFile)
if err != nil { if err != nil {
logger.Printf("ERROR: Failed to read kernel config from %s: %s", Config.KconfigFile, err) log.Printf("ERROR: Failed to read kernel config from %s: %s", Config.KconfigFile, err)
} }
} }
@ -150,7 +148,7 @@ func parseKconfig() (map[string]bool, error) {
if raw == nil { if raw == nil {
raw, err = readKconfigGzip("/proc/config.gz") raw, err = readKconfigGzip("/proc/config.gz")
if err != nil { if err != nil {
logger.Printf("Failed to read /proc/config.gz: %s", err) log.Printf("Failed to read /proc/config.gz: %s", err)
} }
} }

9
source/local/local.go
View file

@ -33,7 +33,6 @@ import (
var ( var (
featureFilesDir = "/etc/kubernetes/node-feature-discovery/features.d/" featureFilesDir = "/etc/kubernetes/node-feature-discovery/features.d/"
hookDir = "/etc/kubernetes/node-feature-discovery/source.d/" hookDir = "/etc/kubernetes/node-feature-discovery/source.d/"
logger = log.New(os.Stderr, "", log.LstdFlags)
) )
// Implement FeatureSource interface // Implement FeatureSource interface
@ -54,10 +53,10 @@ func (s Source) Discover() (source.Features, error) {
// Merge features from hooks and files // Merge features from hooks and files
for k, v := range featuresFromHooks { for k, v := range featuresFromHooks {
if old, ok := featuresFromFiles[k]; ok { if old, ok := featuresFromFiles[k]; ok {
log.Printf("WARNING: overriding label '%s': value changed from '%s' to '%s'", log.Printf("WARNING: overriding label '%s': value changed from '%s' to '%s'",
k, old, v) k, old, v)
} }
featuresFromFiles[k] = v featuresFromFiles[k] = v
} }

3
source/pci/pci.go
View file

@ -20,7 +20,6 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"log" "log"
"os"
"path" "path"
"strings" "strings"
@ -29,8 +28,6 @@ import (
type pciDeviceInfo map[string]string type pciDeviceInfo map[string]string
var logger = log.New(os.Stderr, "", log.LstdFlags)
type NFDConfig struct { type NFDConfig struct {
DeviceClassWhitelist []string `json:"deviceClassWhitelist,omitempty"` DeviceClassWhitelist []string `json:"deviceClassWhitelist,omitempty"`
DeviceLabelFields []string `json:"deviceLabelFields,omitempty"` DeviceLabelFields []string `json:"deviceLabelFields,omitempty"`