Merge pull request #1707 from anderbubble/remove-syslog

Remove `warewulf.conf:syslog`

internal/app/wwctl/overlay/show/main_test.go

@@ -34,7 +34,6 @@ warewulf:
   update interval: 60
   autobuild overlays: true
   host overlay: true
-  syslog: true
 dhcp:
   enabled: true
   range start: 192.168.0.100

internal/pkg/config/buildconfig.go.in

@@ -45,7 +45,6 @@ type WarewulfConf struct {
 	UpdateInterval     int   `yaml:"update interval,omitempty" default:"60"`
 	AutobuildOverlaysP *bool `yaml:"autobuild overlays,omitempty" default:"true"`
 	EnableHostOverlayP *bool `yaml:"host overlay,omitempty" default:"true"`
-	SyslogP            *bool `yaml:"syslog,omitempty" default:"false"`
 	GrubBootP          *bool `yaml:"grubboot,omitempty" default:"false"`
 }
 
@@ -61,10 +60,6 @@ func (this WarewulfConf) EnableHostOverlay() bool {
 	return BoolP(this.EnableHostOverlayP)
 }
 
-func (this WarewulfConf) Syslog() bool {
-	return BoolP(this.SyslogP)
-}
-
 func (this WarewulfConf) GrubBoot() bool {
 	return BoolP(this.GrubBootP)
 }

internal/pkg/config/root_test.go

@@ -15,7 +15,6 @@ func TestDefaultWarewulfYaml(t *testing.T) {
 	assert.Equal(t, 60, conf.Warewulf.UpdateInterval)
 	assert.True(t, conf.Warewulf.AutobuildOverlays())
 	assert.True(t, conf.Warewulf.EnableHostOverlay())
-	assert.False(t, conf.Warewulf.Syslog())
 
 	assert.True(t, conf.DHCP.Enabled())
 	assert.Equal(t, "default", conf.DHCP.Template)
@@ -80,7 +79,6 @@ warewulf:
   update interval: 60
   autobuild overlays: true
   host overlay: true
-  syslog: false
 dhcp:
   enabled: true
   range start: 192.168.200.50
@@ -121,7 +119,6 @@ image mounts:
 	assert.Equal(t, 60, conf.Warewulf.UpdateInterval)
 	assert.True(t, conf.Warewulf.AutobuildOverlays())
 	assert.True(t, conf.Warewulf.EnableHostOverlay())
-	assert.False(t, conf.Warewulf.Syslog())
 
 	assert.True(t, conf.DHCP.Enabled())
 	assert.Equal(t, "192.168.200.50", conf.DHCP.RangeStart)

internal/pkg/upgrade/config.go

@@ -106,7 +106,9 @@ func (this *WarewulfConf) Upgrade() (upgraded *config.WarewulfConf) {
 	upgraded.UpdateInterval = this.UpdateInterval
 	upgraded.AutobuildOverlaysP = this.AutobuildOverlays
 	upgraded.EnableHostOverlayP = this.EnableHostOverlay
-	upgraded.SyslogP = this.Syslog
+	if this.Syslog != nil {
+		wwlog.Warn("syslog configuration ignored: all logs now go to stdout/stderr")
+	}
 	upgraded.GrubBootP = this.GrubBoot
 	return upgraded
 }

internal/pkg/upgrade/config_test.go

@@ -150,7 +150,6 @@ warewulf:
   secure: true
   update interval: 60
   autobuild overlays: true
-  syslog: false
 dhcp:
   enabled: true
   template: default
@@ -216,7 +215,6 @@ warewulf:
   update interval: 60
   autobuild overlays: true
   host overlay: true
-  syslog: false
 dhcp:
   enabled: true
   template: default
@@ -281,7 +279,6 @@ warewulf:
   update interval: 60
   autobuild overlays: true
   host overlay: true
-  syslog: false
 dhcp:
   enabled: true
   range start: 192.168.200.50
@@ -360,7 +357,6 @@ warewulf:
   update interval: 60
   autobuild overlays: true
   host overlay: true
-  syslog: false
 dhcp:
   enabled: true
   range start: 10.0.1.1
@@ -454,7 +450,6 @@ warewulf:
   update interval: 60
   autobuild overlays: true
   host overlay: true
-  syslog: false
 dhcp:
   enabled: true
   range start: 10.0.1.1

internal/pkg/warewulfd/daemon.go

@@ -2,7 +2,6 @@ package warewulfd
 
 import (
 	"fmt"
-	"log/syslog"
 	"os"
 	"os/exec"
 	"strconv"
@@ -10,7 +9,6 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	warewulfconf "github.com/warewulf/warewulf/internal/pkg/config"
 	"github.com/warewulf/warewulf/internal/pkg/util"
 	"github.com/warewulf/warewulf/internal/pkg/wwlog"
 )
@@ -55,22 +53,6 @@ func DaemonInitLogging() error {
 		wwlog.SetLogLevel(wwlog.INFO)
 	}
 
-	conf := warewulfconf.Get()
-
-	if conf.Warewulf.Syslog() {
-
-		wwlog.Debug("Changing log output to syslog")
-
-		logwriter, err := syslog.New(syslog.LOG_NOTICE, "warewulfd")
-		if err != nil {
-			return fmt.Errorf("Could not create syslog writer: %w", err)
-		}
-
-		wwlog.SetLogFormatter(wwlog.DefaultFormatter)
-		wwlog.SetLogWriter(logwriter)
-
-	}
-
 	loginit = true
 
 	return nil