Logging improvements (#195)

- Fix (and test) filtering of lines
- Filter out shadowsocks cannot resolve error
- Change tinyproxy color
- Deduct logging level according to message content
This commit is contained in:
Quentin McGaw
2020-07-12 21:19:44 -04:00
committed by GitHub
parent 4cd6b33044
commit 7252ac722c
9 changed files with 216 additions and 50 deletions

View File

@@ -7,7 +7,6 @@ import (
"github.com/qdm12/golibs/command"
"github.com/qdm12/golibs/logging"
"github.com/qdm12/private-internet-access-docker/internal/constants"
"github.com/qdm12/private-internet-access-docker/internal/firewall"
"github.com/qdm12/private-internet-access-docker/internal/settings"
)
@@ -90,8 +89,7 @@ func (l *looper) Run(ctx context.Context, restart <-chan struct{}, wg *sync.Wait
l.logAndWait(ctx, err)
continue
}
go l.streamMerger.Merge(tinyproxyCtx, stream,
command.MergeName("tinyproxy"), command.MergeColor(constants.ColorTinyproxy()))
go l.streamMerger.Merge(tinyproxyCtx, stream, command.MergeName("tinyproxy"))
waitError := make(chan error)
go func() {
err := waitFn() // blocking