Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

If rendering has failed due to a net.OpError stop rendering #18642

Merged
merged 2 commits into from
Feb 6, 2022
Merged

If rendering has failed due to a net.OpError stop rendering #18642

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1037853
If rendering has failed due to a net.OpError stop rendering
zeripath Feb 6, 2022
6807126
Merge branch 'main' into stop-rendering-if-operror
6543 Feb 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions modules/context/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import (
"context"
"crypto/sha256"
"encoding/hex"
"errors"
"html"
"html/template"
"io"
"net"
"net/http"
"net/url"
"path"
Expand Down Expand Up @@ -265,6 +267,12 @@ func (ctx *Context) ServerError(logMsg string, logErr error) {
func (ctx *Context) serverErrorInternal(logMsg string, logErr error) {
if logErr != nil {
log.ErrorWithSkip(2, "%s: %v", logMsg, logErr)
if errors.Is(logErr, &net.OpError{}) {
zeripath marked this conversation as resolved.
Show resolved Hide resolved
// This is an error within the underlying connection
// and further rendering will not work so just return
return
}

if !setting.IsProd {
ctx.Data["ErrorMsg"] = logErr
}
Expand Down