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

Code maintenance: remove unneeded defaultInterface in Shadowsocks

Browse Source
This commit is contained in:
Quentin McGaw
2020-12-30 21:43:45 +00:00
parent f385c4203a
commit fa7bda7ee4
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/gluetun/main.go
View File

@@ -265,7 +265,7 @@ func _main(background context.Context, buildInfo models.BuildInformation,
wg.Add(1) wg.Add(1)
go httpProxyLooper.Run(ctx, wg) go httpProxyLooper.Run(ctx, wg)
shadowsocksLooper := shadowsocks.NewLooper(allSettings.ShadowSocks, logger, defaultInterface) shadowsocksLooper := shadowsocks.NewLooper(allSettings.ShadowSocks, logger)
restartShadowsocks := shadowsocksLooper.Restart restartShadowsocks := shadowsocksLooper.Restart
wg.Add(1) wg.Add(1)
go shadowsocksLooper.Run(ctx, wg) go shadowsocksLooper.Run(ctx, wg)

4
internal/shadowsocks/loop.go
View File

@@ -24,7 +24,6 @@ type looper struct {
settings settings.ShadowSocks settings settings.ShadowSocks
settingsMutex sync.RWMutex settingsMutex sync.RWMutex
logger logging.Logger logger logging.Logger
defaultInterface string
restart chan struct{} restart chan struct{}
start chan struct{} start chan struct{}
stop chan struct{} stop chan struct{}
@@ -47,11 +46,10 @@ func (l *looper) logAndWait(ctx context.Context, err error) {
const defaultBackoffTime = 10 * time.Second 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{ return &looper{
settings: settings, settings: settings,
logger: logger.WithPrefix("shadowsocks: "), logger: logger.WithPrefix("shadowsocks: "),
defaultInterface: defaultInterface,
restart: make(chan struct{}), restart: make(chan struct{}),
start: make(chan struct{}), start: make(chan struct{}),
stop: make(chan struct{}), stop: make(chan struct{}),