diff --git a/cmd/gluetun/main.go b/cmd/gluetun/main.go index 908c879a..3baa23ab 100644 --- a/cmd/gluetun/main.go +++ b/cmd/gluetun/main.go @@ -265,7 +265,7 @@ func _main(background context.Context, buildInfo models.BuildInformation, wg.Add(1) go httpProxyLooper.Run(ctx, wg) - shadowsocksLooper := shadowsocks.NewLooper(allSettings.ShadowSocks, logger, defaultInterface) + shadowsocksLooper := shadowsocks.NewLooper(allSettings.ShadowSocks, logger) restartShadowsocks := shadowsocksLooper.Restart wg.Add(1) go shadowsocksLooper.Run(ctx, wg) diff --git a/internal/shadowsocks/loop.go b/internal/shadowsocks/loop.go index defbf2c6..d895057a 100644 --- a/internal/shadowsocks/loop.go +++ b/internal/shadowsocks/loop.go @@ -21,14 +21,13 @@ type Looper interface { } type looper struct { - settings settings.ShadowSocks - settingsMutex sync.RWMutex - logger logging.Logger - defaultInterface string - restart chan struct{} - start chan struct{} - stop chan struct{} - backoffTime time.Duration + settings settings.ShadowSocks + settingsMutex sync.RWMutex + logger logging.Logger + restart chan struct{} + start chan struct{} + stop chan struct{} + backoffTime time.Duration } func (l *looper) logAndWait(ctx context.Context, err error) { @@ -47,15 +46,14 @@ func (l *looper) logAndWait(ctx context.Context, err error) { const defaultBackoffTime = 10 * time.Second -func NewLooper(settings settings.ShadowSocks, logger logging.Logger, defaultInterface string) Looper { +func NewLooper(settings settings.ShadowSocks, logger logging.Logger) Looper { return &looper{ - settings: settings, - logger: logger.WithPrefix("shadowsocks: "), - defaultInterface: defaultInterface, - restart: make(chan struct{}), - start: make(chan struct{}), - stop: make(chan struct{}), - backoffTime: defaultBackoffTime, + settings: settings, + logger: logger.WithPrefix("shadowsocks: "), + restart: make(chan struct{}), + start: make(chan struct{}), + stop: make(chan struct{}), + backoffTime: defaultBackoffTime, } }