Maint: upgrade ss-server to v0.3.0

- `SHADOWSOCKS_PORT` in retrocompatibility
- `SHADOWSOCKS_METHOD` in retrocompatibility
- `SHADOWSOCKS_ADDRESS` added
- `SHADOWSOCKS_CIPHER` added
- Shadowsocks config inherit from ss-server's Settings
- Log adapter removed as no longer needed
This commit is contained in:
Quentin McGaw (desktop)
2021-07-29 00:48:46 +00:00
parent 2998cf5e48
commit c61f854edc
6 changed files with 50 additions and 57 deletions

View File

@@ -3,7 +3,6 @@ package shadowsocks
import (
"context"
"strconv"
"sync"
"time"
@@ -88,7 +87,7 @@ func (l *looper) Run(ctx context.Context, done chan<- struct{}) {
for ctx.Err() == nil {
settings := l.GetSettings()
server, err := shadowsockslib.NewServer(settings.Method, settings.Password, adaptLogger(l.logger, settings.Log))
server, err := shadowsockslib.NewServer(settings.Settings, l.logger)
if err != nil {
crashed = true
l.logAndWait(ctx, err)
@@ -99,7 +98,7 @@ func (l *looper) Run(ctx context.Context, done chan<- struct{}) {
waitError := make(chan error)
go func() {
waitError <- server.Listen(shadowsocksCtx, ":"+strconv.Itoa(int(settings.Port)))
waitError <- server.Listen(shadowsocksCtx)
}()
if err != nil {
crashed = true