kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix lint errors

Browse Source
This commit is contained in:
Gregory Kurtzer
2021-09-30 23:43:24 -07:00
parent 238b61a682
commit 6e78f1e89b
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/pkg/warewulfd/runtime.go
View File

@@ -22,7 +22,7 @@ func RuntimeOverlaySend(w http.ResponseWriter, req *http.Request) {
nodes, err := node.New()
if err != nil {
daemonLogf("%s | ERROR: Could not read node configuration file: %s\n", err)
daemonLogf("ERROR: Could not read node configuration file: %s\n", err)
w.WriteHeader(503)
return
}
@@ -30,13 +30,13 @@ func RuntimeOverlaySend(w http.ResponseWriter, req *http.Request) {
remote := strings.Split(req.RemoteAddr, ":")
port, err := strconv.Atoi(remote[1])
if err != nil {
daemonLogf("%s | ERROR: Could not convert port to integer: %s\n", remote[1])
daemonLogf("ERROR: Could not convert port to integer: %s\n", remote[1])
w.WriteHeader(503)
return
}
if err != nil {
daemonLogf("%s | ERROR: Could not load configuration file: %s\n", err)
daemonLogf("ERROR: Could not load configuration file: %s\n", err)
return
}
@@ -66,7 +66,7 @@ func RuntimeOverlaySend(w http.ResponseWriter, req *http.Request) {
if n.RuntimeOverlay.Defined() {
fileName := config.RuntimeOverlayImage(n.Id.Get())
if conf.Warewulf.AutobuildOverlays == true {
if conf.Warewulf.AutobuildOverlays {
if !util.IsFile(fileName) || util.PathIsNewer(fileName, node.ConfigFile) || util.PathIsNewer(fileName, config.RuntimeOverlaySource(n.RuntimeOverlay.Get())) {
daemonLogf("BUILD: %15s: Runtime Overlay\n", n.Id.Get())
_ = overlay.BuildRuntimeOverlay([]node.NodeInfo{n})

2
internal/pkg/warewulfd/system.go
View File

@@ -28,7 +28,7 @@ func SystemOverlaySend(w http.ResponseWriter, req *http.Request) {
if n.SystemOverlay.Defined() {
fileName := config.SystemOverlayImage(n.Id.Get())
if conf.Warewulf.AutobuildOverlays == true {
if conf.Warewulf.AutobuildOverlays {
if !util.IsFile(fileName) || util.PathIsNewer(fileName, node.ConfigFile) || util.PathIsNewer(fileName, config.SystemOverlaySource(n.SystemOverlay.Get())) {
daemonLogf("BUILD: %15s: System Overlay\n", n.Id.Get())
_ = overlay.BuildSystemOverlay([]node.NodeInfo{n})

13
internal/pkg/warewulfd/util.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/pkg/errors"
)
var logwriter syslog.Writer
var logwriter *syslog.Writer
var loginit bool
func daemonLogf(message string, a ...interface{}) {
@@ -26,19 +26,22 @@ func daemonLogf(message string, a ...interface{}) {
return
}
if conf.Warewulf.Syslog == true {
if loginit == false {
logwriter, err := syslog.New(syslog.LOG_NOTICE, "warewulfd")
if conf.Warewulf.Syslog {
if !loginit {
var err error
logwriter, err = syslog.New(syslog.LOG_NOTICE, "warewulfd")
if err != nil {
return
}
log.SetOutput(logwriter)
loginit = true
}
log.SetFlags(0)
log.SetPrefix("")
log.Printf(message, a...)
} else {
prefix := fmt.Sprintf("[%s] ", time.Now().Format(time.UnixDate))
fmt.Printf(prefix+message, a...)