Using WithPrefix for loggers

internal/openvpn/auth.go

@@ -11,10 +11,10 @@ func (c *configurator) WriteAuthFile(user, password string, uid, gid int) error
 	if err != nil {
 		return err
 	} else if authExists { // in case of container stop/start
-		c.logger.Info("%s: %s already exists", logPrefix, constants.OpenVPNAuthConf)
+		c.logger.Info("%s already exists", constants.OpenVPNAuthConf)
 		return nil
 	}
-	c.logger.Info("%s: writing auth file %s", logPrefix, constants.OpenVPNAuthConf)
+	c.logger.Info("writing auth file %s", constants.OpenVPNAuthConf)
 	return c.fileManager.WriteLinesToFile(
 		string(constants.OpenVPNAuthConf),
 		[]string{user, password},

internal/openvpn/command.go

@@ -9,7 +9,7 @@ import (
 )
 
 func (c *configurator) Start() (stdout io.ReadCloser, waitFn func() error, err error) {
-	c.logger.Info("%s: starting openvpn", logPrefix)
+	c.logger.Info("starting openvpn")
 	stdout, _, waitFn, err = c.commander.Start("openvpn", "--config", string(constants.OpenVPNConf))
 	return stdout, waitFn, err
 }

internal/openvpn/openvpn.go

@@ -10,8 +10,6 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-const logPrefix = "openvpn configurator"
-
 type Configurator interface {
 	Version() (string, error)
 	WriteAuthFile(user, password string, uid, gid int) error
@@ -32,7 +30,7 @@ type configurator struct {
 func NewConfigurator(logger logging.Logger, fileManager files.FileManager) Configurator {
 	return &configurator{
 		fileManager: fileManager,
-		logger:      logger,
+		logger:      logger.WithPrefix("openvpn configurator: "),
 		commander:   command.NewCommander(),
 		openFile:    os.OpenFile,
 		mkDev:       unix.Mkdev,

internal/openvpn/tun.go

@@ -10,7 +10,7 @@ import (
 
 // CheckTUN checks the tunnel device is present and accessible
 func (c *configurator) CheckTUN() error {
-	c.logger.Info("%s: checking for device %s", logPrefix, constants.TunnelDevice)
+	c.logger.Info("checking for device %s", constants.TunnelDevice)
 	f, err := c.openFile(string(constants.TunnelDevice), os.O_RDWR, 0)
 	if err != nil {
 		return fmt.Errorf("TUN device is not available: %w", err)
@@ -22,7 +22,7 @@ func (c *configurator) CheckTUN() error {
 }
 
 func (c *configurator) CreateTUN() error {
-	c.logger.Info("%s: creating %s", logPrefix, constants.TunnelDevice)
+	c.logger.Info("creating %s", constants.TunnelDevice)
 	if err := c.fileManager.CreateDir("/dev/net"); err != nil {
 		return err
 	}