Maint: package local narrow Logger interfaces

This commit is contained in:
Quentin McGaw (desktop)
2021-09-23 16:58:21 +00:00
parent d8e008606f
commit cf95692b93
57 changed files with 414 additions and 154 deletions

View File

@@ -0,0 +1,12 @@
package openvpn
type Logger interface {
Debug(s string)
Infoer
Warn(s string)
Error(s string)
}
type Infoer interface {
Info(s string)
}

View File

@@ -3,7 +3,6 @@ package openvpn
import (
"github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/golibs/command"
"github.com/qdm12/golibs/logging"
)
var _ Interface = (*Configurator)(nil)
@@ -15,15 +14,15 @@ type Interface interface {
}
type Configurator struct {
logger logging.Logger
logger Infoer
cmder command.RunStarter
configPath string
authFilePath string
puid, pgid int
}
func New(logger logging.Logger,
cmder command.RunStarter, puid, pgid int) *Configurator {
func New(logger Infoer, cmder command.RunStarter,
puid, pgid int) *Configurator {
return &Configurator{
logger: logger,
cmder: cmder,

View File

@@ -5,17 +5,16 @@ import (
"github.com/qdm12/gluetun/internal/configuration"
"github.com/qdm12/golibs/command"
"github.com/qdm12/golibs/logging"
)
type Runner struct {
settings configuration.OpenVPN
starter command.Starter
logger logging.Logger
logger Logger
}
func NewRunner(settings configuration.OpenVPN, starter command.Starter,
logger logging.Logger) *Runner {
logger Logger) *Runner {
return &Runner{
starter: starter,
logger: logger,

View File

@@ -8,7 +8,7 @@ import (
)
func streamLines(ctx context.Context, done chan<- struct{},
logger logging.Logger, stdout, stderr chan string,
logger Logger, stdout, stderr chan string,
tunnelReady chan<- struct{}) {
defer close(done)