From 8531fc49dcabc1f6d8a1958aafa839882189c122 Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Sat, 8 May 2021 22:30:22 +0200 Subject: [PATCH] cleanup log --- go.mod | 2 +- go.sum | 4 ++-- internal/clientrtsp/client.go | 9 +++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index b68b3013..e704c232 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.15 require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect - github.com/aler9/gortsplib v0.0.0-20210508200522-b98fa90057b4 + github.com/aler9/gortsplib v0.0.0-20210508202705-7469a3362a7d github.com/asticode/go-astits v0.0.0-00010101000000-000000000000 github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.4.9 diff --git a/go.sum b/go.sum index 72c8eb53..0a425c5f 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,8 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2c github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/aler9/go-astits v0.0.0-20210423195926-582b09ed7c04 h1:CXgQLsU4uxWAmsXNOjGLbj0A+0IlRcpZpMgI13fmVwo= github.com/aler9/go-astits v0.0.0-20210423195926-582b09ed7c04/go.mod h1:DkOWmBNQpnr9mv24KfZjq4JawCFX1FCqjLVGvO0DygQ= -github.com/aler9/gortsplib v0.0.0-20210508200522-b98fa90057b4 h1:mL4yLi09Bpph+cLlXdU6CJAsIox9a5grz4ik4M3Q9ik= -github.com/aler9/gortsplib v0.0.0-20210508200522-b98fa90057b4/go.mod h1:zVCg+TQX445hh1pC5QgAuuBvvXZMWLY1XYz626dGFqY= +github.com/aler9/gortsplib v0.0.0-20210508202705-7469a3362a7d h1:c9eARLYpLvZM6WX7TLIgp1z7NvpYxK4ceFdx62te6YU= +github.com/aler9/gortsplib v0.0.0-20210508202705-7469a3362a7d/go.mod h1:zVCg+TQX445hh1pC5QgAuuBvvXZMWLY1XYz626dGFqY= github.com/aler9/rtmp v0.0.0-20210403095203-3be4a5535927 h1:95mXJ5fUCYpBRdSOnLAQAdJHHKxxxJrVCiaqDi965YQ= github.com/aler9/rtmp v0.0.0-20210403095203-3be4a5535927/go.mod h1:vzuE21rowz+lT1NGsWbreIvYulgBpCGnQyeTyFblUHc= github.com/asticode/go-astikit v0.20.0 h1:+7N+J4E4lWx2QOkRdOf6DafWJMv6O4RRfgClwQokrH8= diff --git a/internal/clientrtsp/client.go b/internal/clientrtsp/client.go index 7c79395c..1aed3a4f 100644 --- a/internal/clientrtsp/client.go +++ b/internal/clientrtsp/client.go @@ -23,8 +23,6 @@ const ( pauseAfterAuthError = 2 * time.Second ) -var errTerminated = errors.New("terminated") - func isTeardownErr(err error) bool { _, ok := err.(liberrors.ErrServerSessionTeardown) return ok @@ -97,7 +95,7 @@ func New( // Close closes a Client. func (c *Client) Close(err error) { - if err != io.EOF && err != errTerminated && !isTeardownErr(err) { + if err != io.EOF && !isTeardownErr(err) { c.log(logger.Info, "ERR: %v", err) } @@ -152,11 +150,10 @@ func (c *Client) OnDescribe(ctx *gortsplib.ServerHandlerOnDescribeCtx) (*base.Re return terr.Response, nil, nil case readpublisher.ErrAuthCritical: - c.log(logger.Info, "ERR: %v", terr.Message) - // wait some seconds to stop brute force attacks <-time.After(pauseAfterAuthError) - return terr.Response, nil, errTerminated + + return terr.Response, nil, errors.New(terr.Message) case readpublisher.ErrNoOnePublishing: return &base.Response{