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

Log stderr stream from shadowsocks

Browse Source
This commit is contained in:
Quentin McGaw
2020-04-14 12:22:14 +00:00
parent 58459f0336
commit 422bd8d428
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/main.go
View File

@@ -253,14 +253,15 @@ func main() {
e.FatalOnError(err)
err = firewallConf.AllowAnyIncomingOnPort(allSettings.ShadowSocks.Port)
e.FatalOnError(err)
stream, waitFn, err := shadowsocksConf.Start("0.0.0.0", allSettings.ShadowSocks.Port, allSettings.ShadowSocks.Password, allSettings.ShadowSocks.Log)
stdout, stderr, waitFn, err := shadowsocksConf.Start("0.0.0.0", allSettings.ShadowSocks.Port, allSettings.ShadowSocks.Password, allSettings.ShadowSocks.Log)
e.FatalOnError(err)
go func() {
if err := waitFn(); err != nil {
logger.Error(err)
}
}()
go streamMerger.Merge("shadowsocks", stream)
go streamMerger.Merge("shadowsocks", stdout)
go streamMerger.Merge("shadowsocks error", stderr)
}
stream, waitFn, err := ovpnConf.Start()