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

5
internal/cli/cli.go
View File

@@ -4,14 +4,15 @@ package cli
import (
"context"
"github.com/qdm12/golibs/logging"
"github.com/qdm12/golibs/os"
)
type CLI interface {
ClientKey(args []string, openFile os.OpenFileFunc) error
HealthCheck(ctx context.Context) error
OpenvpnConfig(os os.OS) error
Update(ctx context.Context, args []string, os os.OS) error
OpenvpnConfig(os os.OS, logger logging.Logger) error
Update(ctx context.Context, args []string, os os.OS, logger logging.Logger) error
}
type cli struct{}

4
internal/cli/openvpnconfig.go
View File

@@ -14,9 +14,7 @@ import (
"github.com/qdm12/golibs/params"
)
func (c *cli) OpenvpnConfig(os os.OS) error {
logger := logging.New(logging.StdLog)
func (c *cli) OpenvpnConfig(os os.OS, logger logging.Logger) error {
var allSettings configuration.Settings
err := allSettings.Read(params.NewEnv(), os, logger)
if err != nil {

3
internal/cli/update.go
View File

@@ -15,7 +15,7 @@ import (
"github.com/qdm12/golibs/os"
)
func (c *cli) Update(ctx context.Context, args []string, os os.OS) error {
func (c *cli) Update(ctx context.Context, args []string, os os.OS, logger logging.Logger) error {
options := configuration.Updater{CLI: true}
var flushToFile bool
flagSet := flag.NewFlagSet("update", flag.ExitOnError)
@@ -39,7 +39,6 @@ func (c *cli) Update(ctx context.Context, args []string, os os.OS) error {
if err := flagSet.Parse(args); err != nil {
return err
}
logger := logging.New(logging.StdLog)
if !flushToFile && !options.Stdout {
return fmt.Errorf("at least one of -file or -stdout must be specified")
}

2
internal/dns/loop.go
View File

@@ -55,7 +55,7 @@ func NewLooper(conf unbound.Configurator, settings configuration.DNS, client *ht
},
conf: conf,
client: client,
logger: logger.NewChild(logging.SetPrefix("dns over tls: ")),
logger: logger,
username: username,
puid: puid,
pgid: pgid,

2
internal/firewall/firewall.go
View File

@@ -58,7 +58,7 @@ func NewConfigurator(logger logging.Logger, routing routing.Routing, openFile os
commander := command.NewCommander()
return &configurator{
commander: commander,
logger: logger.NewChild(logging.SetPrefix("firewall: ")),
logger: logger,
routing: routing,
openFile: openFile,
allowedInputPorts: make(map[uint16]string),

5
internal/healthcheck/server.go
View File

@@ -22,11 +22,10 @@ type server struct {
}
func NewServer(address string, logger logging.Logger) Server {
healthcheckLogger := logger.NewChild(logging.SetPrefix("healthcheck: "))
return &server{
address: address,
logger: healthcheckLogger,
handler: newHandler(healthcheckLogger),
logger: logger,
handler: newHandler(logger),
resolver: net.DefaultResolver,
}
}

2
internal/httpproxy/loop.go
View File

@@ -41,7 +41,7 @@ func NewLooper(logger logging.Logger, settings configuration.HTTPProxy) Looper {
status: constants.Stopped,
settings: settings,
},
logger: logger.NewChild(logging.SetPrefix("http proxy: ")),
logger: logger,
start: make(chan struct{}),
running: make(chan models.LoopStatus),
stop: make(chan struct{}),

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,

2
internal/publicip/loop.go
View File

@@ -60,7 +60,7 @@ func NewLooper(client *http.Client, logger logging.Logger,
// Objects
client: client,
getter: NewIPGetter(client),
logger: logger.NewChild(logging.SetPrefix("ip getter: ")),
logger: logger,
os: os,
puid: puid,
pgid: pgid,

2
internal/routing/routing.go
View File

@@ -37,7 +37,7 @@ type routing struct {
// NewRouting creates a new routing instance.
func NewRouting(logger logging.Logger) Routing {
return &routing{
logger: logger.NewChild(logging.SetPrefix("routing: ")),
logger: logger,
verbose: true,
}
}

5
internal/server/server.go
View File

@@ -28,12 +28,11 @@ func New(address string, logEnabled bool, logger logging.Logger,
buildInfo models.BuildInformation,
openvpnLooper openvpn.Looper, unboundLooper dns.Looper,
updaterLooper updater.Looper, publicIPLooper publicip.Looper) Server {
serverLogger := logger.NewChild(logging.SetPrefix("http server: "))
handler := newHandler(serverLogger, logEnabled, buildInfo,
handler := newHandler(logger, logEnabled, buildInfo,
openvpnLooper, unboundLooper, updaterLooper, publicIPLooper)
return &server{
address: address,
logger: serverLogger,
logger: logger,
handler: handler,
}
}

2
internal/shadowsocks/loop.go
View File

@@ -58,7 +58,7 @@ func NewLooper(settings configuration.ShadowSocks, logger logging.Logger) Looper
status: constants.Stopped,
settings: settings,
},
logger: logger.NewChild(logging.SetPrefix("shadowsocks: ")),
logger: logger,
start: make(chan struct{}),
running: make(chan models.LoopStatus),
stop: make(chan struct{}),

2
internal/storage/storage.go
View File

@@ -22,7 +22,7 @@ type storage struct {
func New(logger logging.Logger, os os.OS, filepath string) Storage {
return &storage{
os: os,
logger: logger.NewChild(logging.SetPrefix("storage: ")),
logger: logger,
filepath: filepath,
}
}

5
internal/updater/loop.go
View File

@@ -47,16 +47,15 @@ const defaultBackoffTime = 5 * time.Second
func NewLooper(settings configuration.Updater, currentServers models.AllServers,
storage storage.Storage, setAllServers func(allServers models.AllServers),
client *http.Client, logger logging.Logger) Looper {
loggerWithPrefix := logger.NewChild(logging.SetPrefix("updater: "))
return &looper{
state: state{
status: constants.Stopped,
settings: settings,
},
updater: New(settings, client, currentServers, loggerWithPrefix),
updater: New(settings, client, currentServers, logger),
storage: storage,
setAllServers: setAllServers,
logger: loggerWithPrefix,
logger: logger,
start: make(chan struct{}),
running: make(chan models.LoopStatus),
stop: make(chan struct{}),