Skip to content

fix: WireGuard log level respects --log-level flag #6194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cvl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: WireGuard log level respects --log-level flag #6194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions logconfig/wglevel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package logconfig

import "github.com/rs/zerolog"

// WireGuardLogLevel maps the node's configured zerolog level to a WireGuard
// device log level (0=silent, 1=error, 2=verbose).
// This ensures WireGuard logging respects the --log-level flag.
func WireGuardLogLevel() int {
switch CurrentLogOptions.LogLevel {
case zerolog.TraceLevel, zerolog.DebugLevel:
return 2 // device.LogLevelVerbose
case zerolog.InfoLevel, zerolog.WarnLevel:
return 1 // device.LogLevelError
default:
return 0 // device.LogLevelSilent
}
}
3 changes: 2 additions & 1 deletion mobile/mysterium/wireguard_connection_setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import (
"golang.zx2c4.com/wireguard/tun"

"github.com/mysteriumnetwork/node/core/connection"
"github.com/mysteriumnetwork/node/logconfig"
"github.com/mysteriumnetwork/node/core/connection/connectionstate"
"github.com/mysteriumnetwork/node/core/ip"
"github.com/mysteriumnetwork/node/p2p"
Expand Down Expand Up @@ -209,7 +210,7 @@ func (w *wireguardDeviceImpl) Start(privateKey string, config wireguard.ServiceC
}
}()

w.device = device.NewDevice(tunDevice, conn.NewStdNetBind(), device.NewLogger(device.LogLevelVerbose, "[userspace-wg]"))
w.device = device.NewDevice(tunDevice, conn.NewStdNetBind(), device.NewLogger(logconfig.WireGuardLogLevel(), "[userspace-wg]"))

err = w.applyConfig(w.device, privateKey, config)
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion services/wireguard/endpoint/netstack-provider/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"golang.zx2c4.com/wireguard/device"

"github.com/mysteriumnetwork/node/services/wireguard/endpoint/userspace"
"github.com/mysteriumnetwork/node/logconfig"
"github.com/mysteriumnetwork/node/services/wireguard/wgcfg"
)

Expand All @@ -53,7 +54,7 @@ func (c *client) ConfigureDevice(cfg wgcfg.DeviceConfig) error {
return fmt.Errorf("failed to create netstack device %s: %w", cfg.IfaceName, err)
}

logger := device.NewLogger(device.LogLevelVerbose, fmt.Sprintf("(%s) ", cfg.IfaceName))
logger := device.NewLogger(logconfig.WireGuardLogLevel(), fmt.Sprintf("(%s) ", cfg.IfaceName))
wgDevice := device.NewDevice(tunnel, conn.NewDefaultBind(), logger)

log.Info().Msg("Applying interface configuration")
Expand Down
3 changes: 2 additions & 1 deletion services/wireguard/endpoint/proxyclient/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"golang.zx2c4.com/wireguard/device"

"github.com/mysteriumnetwork/node/config"
"github.com/mysteriumnetwork/node/logconfig"
"github.com/mysteriumnetwork/node/services/wireguard/endpoint/netstack"
"github.com/mysteriumnetwork/node/services/wireguard/endpoint/userspace"
"github.com/mysteriumnetwork/node/services/wireguard/wgcfg"
Expand Down Expand Up @@ -70,7 +71,7 @@ func (c *client) ConfigureDevice(cfg wgcfg.DeviceConfig) error {
return fmt.Errorf("failed to create netstack device %s: %w", cfg.IfaceName, err)
}

logger := device.NewLogger(device.LogLevelVerbose, fmt.Sprintf("(%s) ", cfg.IfaceName))
logger := device.NewLogger(logconfig.WireGuardLogLevel(), fmt.Sprintf("(%s) ", cfg.IfaceName))
wgDevice := device.NewDevice(tunnel, conn.NewDefaultBind(), logger)

log.Info().Msg("Applying interface configuration")
Expand Down
3 changes: 2 additions & 1 deletion services/wireguard/endpoint/userspace/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"golang.zx2c4.com/wireguard/tun"

"github.com/mysteriumnetwork/node/services/wireguard/connection/dns"
"github.com/mysteriumnetwork/node/logconfig"
"github.com/mysteriumnetwork/node/services/wireguard/wgcfg"
"github.com/mysteriumnetwork/node/utils/actionstack"
"github.com/mysteriumnetwork/node/utils/netutil"
Expand All @@ -52,7 +53,7 @@ func (c *client) ConfigureDevice(config wgcfg.DeviceConfig) (err error) {
return errors.Wrap(err, "failed to create TUN device")
}

devAPI := device.NewDevice(c.tun, conn.NewDefaultBind(), device.NewLogger(device.LogLevelVerbose, "[userspace-wg]"))
devAPI := device.NewDevice(c.tun, conn.NewDefaultBind(), device.NewLogger(logconfig.WireGuardLogLevel(), "[userspace-wg]"))
c.devAPI = devAPI
rollback.Push(func() {
devAPI.Close()
Expand Down
3 changes: 2 additions & 1 deletion supervisor/daemon/wireguard/wginterface/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"golang.zx2c4.com/wireguard/device"

"github.com/mysteriumnetwork/node/services/wireguard/connection/dns"
"github.com/mysteriumnetwork/node/logconfig"
"github.com/mysteriumnetwork/node/services/wireguard/wgcfg"
"github.com/mysteriumnetwork/node/utils/netutil"
)
Expand All @@ -47,7 +48,7 @@ func New(cfg wgcfg.DeviceConfig, uid string) (*WgInterface, error) {
return nil, fmt.Errorf("failed to create TUN device %s: %w", cfg.IfaceName, err)
}

logger := device.NewLogger(device.LogLevelVerbose, fmt.Sprintf("(%s) ", interfaceName))
logger := device.NewLogger(logconfig.WireGuardLogLevel(), fmt.Sprintf("(%s) ", interfaceName))
logger.Verbosef("Starting wireguard-go")

logger.Verbosef("Starting device")
Expand Down
Loading