admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat: adapt logger prefix to VPN used

Browse Source 
- `openvpn: ` for OpenVPN
- `wireguard: ` for Wireguard
This commit is contained in:
Quentin McGaw (desktop)
2021-09-12 13:27:30 +00:00
parent cc677bde93
commit 2ea00d149f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/vpn/loop.go
View File

@@ -46,7 +46,7 @@ type Loop struct {
dnsLooper dns.Looper dnsLooper dns.Looper
// Other objects // Other objects
starter command.Starter // for OpenVPN starter command.Starter // for OpenVPN
logger logging.Logger logger logging.ParentLogger
client *http.Client client *http.Client
// Internal channels and values // Internal channels and values
stop <-chan struct{} stop <-chan struct{}
@@ -72,7 +72,7 @@ func NewLoop(vpnSettings configuration.VPN,
netLinker netlink.NetLinker, fw firewallConfigurer, routing routing.VPNGetter, netLinker netlink.NetLinker, fw firewallConfigurer, routing routing.VPNGetter,
portForward portforward.StartStopper, starter command.Starter, portForward portforward.StartStopper, starter command.Starter,
publicip publicip.Looper, dnsLooper dns.Looper, publicip publicip.Looper, dnsLooper dns.Looper,
logger logging.Logger, client *http.Client, logger logging.ParentLogger, client *http.Client,
buildInfo models.BuildInformation, versionInfo bool) *Loop { buildInfo models.BuildInformation, versionInfo bool) *Loop {
start := make(chan struct{}) start := make(chan struct{})
running := make(chan models.LoopStatus) running := make(chan models.LoopStatus)

6
internal/vpn/run.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/qdm12/gluetun/internal/constants" "github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/gluetun/internal/provider" "github.com/qdm12/gluetun/internal/provider"
"github.com/qdm12/gluetun/internal/publicip/models" "github.com/qdm12/gluetun/internal/publicip/models"
"github.com/qdm12/golibs/logging"
) )
type Runner interface { type Runner interface {
@@ -34,13 +35,14 @@ func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
var vpnRunner vpnRunner var vpnRunner vpnRunner
var serverName, vpnInterface string var serverName, vpnInterface string
var err error var err error
subLogger := l.logger.NewChild(logging.Settings{Prefix: settings.Type + ": "})
if settings.Type == constants.OpenVPN { if settings.Type == constants.OpenVPN {
vpnInterface = settings.OpenVPN.Interface vpnInterface = settings.OpenVPN.Interface
vpnRunner, serverName, err = setupOpenVPN(ctx, l.fw, vpnRunner, serverName, err = setupOpenVPN(ctx, l.fw,
l.openvpnConf, providerConf, settings, l.starter, l.logger) l.openvpnConf, providerConf, settings, l.starter, subLogger)
} else { // Wireguard } else { // Wireguard
vpnInterface = settings.Wireguard.Interface 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 { if err != nil {
l.crashed(ctx, err) l.crashed(ctx, err)