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

Maintenance: upgrade golibs (affects logger)

Browse Source
This commit is contained in:
Quentin McGaw
2021-05-12 22:57:15 +00:00
parent dd1b23773e
commit 7d6763cde7
18 changed files with 127 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/openvpn/loop.go
View File

@@ -65,7 +65,7 @@ const (
func NewLooper(settings configuration.OpenVPN,
username string, puid, pgid int, allServers models.AllServers,
conf Configurator, fw firewall.Configurator, routing routing.Routing,
logger logging.Logger, client *http.Client, openFile os.OpenFileFunc,
logger logging.ParentLogger, client *http.Client, openFile os.OpenFileFunc,
tunnelReady chan<- struct{}, healthy <-chan bool) Looper {
return &looper{
state: state{
@@ -79,8 +79,8 @@ func NewLooper(settings configuration.OpenVPN,
conf: conf,
fw: fw,
routing: routing,
logger: logger.NewChild(logging.SetPrefix("openvpn: ")),
pfLogger: logger.NewChild(logging.SetPrefix("port forwarding: ")),
logger: logger.NewChild(logging.Settings{Prefix: "openvpn: "}),
pfLogger: logger.NewChild(logging.Settings{Prefix: "port forwarding: "}),
client: client,
openFile: openFile,
tunnelReady: tunnelReady,

2
internal/openvpn/openvpn.go
View File

@@ -29,7 +29,7 @@ type configurator struct {
func NewConfigurator(logger logging.Logger, os os.OS, unix unix.Unix) Configurator {
return &configurator{
logger: logger.NewChild(logging.SetPrefix("openvpn configurator: ")),
logger: logger,
commander: command.NewCommander(),
os: os,
unix: unix,