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

Maint: package local narrow Logger interfaces

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/cli/healthcheck.go
View File

@@ -8,19 +8,18 @@ import (
"github.com/qdm12/gluetun/internal/configuration"
"github.com/qdm12/gluetun/internal/healthcheck"
"github.com/qdm12/golibs/logging"
"github.com/qdm12/golibs/params"
)
type HealthChecker interface {
HealthCheck(ctx context.Context, env params.Interface, logger logging.Logger) error
HealthCheck(ctx context.Context, env params.Interface, warner configuration.Warner) error
}
func (c *CLI) HealthCheck(ctx context.Context, env params.Interface,
logger logging.Logger) error {
warner configuration.Warner) error {
// Extract the health server port from the configuration.
config := configuration.Health{}
err := config.Read(env, logger)
err := config.Read(env, warner)
if err != nil {
return err
}

10
internal/cli/openvpnconfig.go
View File

@@ -9,15 +9,19 @@ import (
"github.com/qdm12/gluetun/internal/constants"
"github.com/qdm12/gluetun/internal/provider"
"github.com/qdm12/gluetun/internal/storage"
"github.com/qdm12/golibs/logging"
"github.com/qdm12/golibs/params"
)
type OpenvpnConfigMaker interface {
OpenvpnConfig(logger logging.Logger, env params.Interface) error
OpenvpnConfig(logger OpenvpnConfigLogger, env params.Interface) error
}
func (c *CLI) OpenvpnConfig(logger logging.Logger, env params.Interface) error {
type OpenvpnConfigLogger interface {
Info(s string)
Warn(s string)
}
func (c *CLI) OpenvpnConfig(logger OpenvpnConfigLogger, env params.Interface) error {
storage, err := storage.New(logger, constants.ServersData)
if err != nil {
return err

11
internal/cli/update.go
View File

@@ -15,7 +15,6 @@ import (
"github.com/qdm12/gluetun/internal/models"
"github.com/qdm12/gluetun/internal/storage"
"github.com/qdm12/gluetun/internal/updater"
"github.com/qdm12/golibs/logging"
)
var (
@@ -26,10 +25,16 @@ var (
)
type Updater interface {
Update(ctx context.Context, args []string, logger logging.Logger) error
Update(ctx context.Context, args []string, logger UpdaterLogger) error
}
func (c *CLI) Update(ctx context.Context, args []string, logger logging.Logger) error {
type UpdaterLogger interface {
Info(s string)
Warn(s string)
Error(s string)
}
func (c *CLI) Update(ctx context.Context, args []string, logger UpdaterLogger) error {
options := configuration.Updater{CLI: true}
var endUserMode, maintainerMode, updateAll bool
flagSet := flag.NewFlagSet("update", flag.ExitOnError)