diff --git a/internal/vpn/loop.go b/internal/vpn/loop.go index 750d72c3..49885870 100644 --- a/internal/vpn/loop.go +++ b/internal/vpn/loop.go @@ -46,7 +46,7 @@ type Loop struct { dnsLooper dns.Looper // Other objects starter command.Starter // for OpenVPN - logger logging.Logger + logger logging.ParentLogger client *http.Client // Internal channels and values stop <-chan struct{} @@ -72,7 +72,7 @@ func NewLoop(vpnSettings configuration.VPN, netLinker netlink.NetLinker, fw firewallConfigurer, routing routing.VPNGetter, portForward portforward.StartStopper, starter command.Starter, publicip publicip.Looper, dnsLooper dns.Looper, - logger logging.Logger, client *http.Client, + logger logging.ParentLogger, client *http.Client, buildInfo models.BuildInformation, versionInfo bool) *Loop { start := make(chan struct{}) running := make(chan models.LoopStatus) diff --git a/internal/vpn/run.go b/internal/vpn/run.go index 73b3618a..216c81c0 100644 --- a/internal/vpn/run.go +++ b/internal/vpn/run.go @@ -7,6 +7,7 @@ import ( "github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/gluetun/internal/provider" "github.com/qdm12/gluetun/internal/publicip/models" + "github.com/qdm12/golibs/logging" ) type Runner interface { @@ -34,13 +35,14 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) { var vpnRunner vpnRunner var serverName, vpnInterface string var err error + subLogger := l.logger.NewChild(logging.Settings{Prefix: settings.Type + ": "}) if settings.Type == constants.OpenVPN { vpnInterface = settings.OpenVPN.Interface vpnRunner, serverName, err = setupOpenVPN(ctx, l.fw, - l.openvpnConf, providerConf, settings, l.starter, l.logger) + l.openvpnConf, providerConf, settings, l.starter, subLogger) } else { // Wireguard vpnInterface = settings.Wireguard.Interface - vpnRunner, serverName, err = setupWireguard(ctx, l.netLinker, l.fw, providerConf, settings, l.logger) + vpnRunner, serverName, err = setupWireguard(ctx, l.netLinker, l.fw, providerConf, settings, subLogger) } if err != nil { l.crashed(ctx, err)