Skip to content

Fix nil checking on typed interface #17598

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

Merged
merged 9 commits into from
Nov 15, 2021
Merged

Fix nil checking on typed interface #17598

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6b22b0e
Fix nil checking on typed interface
Nov 9, 2021
e1cecf8
Remove unnecessary code
Nov 10, 2021
120988b
Patch `NewBleveIndexer`
Nov 10, 2021
0dac637
Fix low-level functions
Nov 10, 2021
3297fce
Remove deadcode
Nov 10, 2021
05317d6
Fix GetSession
Nov 11, 2021
7265ce8
Merge branch 'main' into nil-typed-interface
lunny Nov 15, 2021
1fb1ccd
Close Elastic search when err isn't nil
Nov 15, 2021
9d4c953
Update elastic_search.go
wxiaoguang Nov 15, 2021
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
4 changes: 4 additions & 0 deletions modules/indexer/code/bleve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,10 @@ func NewBleveIndexer(indexDir string) (*BleveIndexer, bool, error) {
indexDir: indexDir,
}
created, err := indexer.init()
if err != nil {
indexer.Close()
return nil, false, err
}
return indexer, created, err
}

Expand Down
6 changes: 0 additions & 6 deletions modules/indexer/code/indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,6 @@ func Init() {

rIndexer, populate, err = NewBleveIndexer(setting.Indexer.RepoPath)
if err != nil {
if rIndexer != nil {
rIndexer.Close()
}
cancel()
indexer.Close()
close(waitChannel)
Expand All @@ -205,9 +202,6 @@ func Init() {

rIndexer, populate, err = NewElasticSearchIndexer(setting.Indexer.RepoConnStr, setting.Indexer.RepoIndexerName)
if err != nil {
if rIndexer != nil {
rIndexer.Close()
}
cancel()
indexer.Close()
close(waitChannel)
Expand Down
8 changes: 0 additions & 8 deletions routers/web/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,6 @@ func Recovery() func(next http.Handler) http.Handler {
log.Error("%v", combinedErr)

sessionStore := session.GetSession(req)
if sessionStore == nil {
if setting.IsProd {
http.Error(w, http.StatusText(500), 500)
} else {
http.Error(w, combinedErr, 500)
}
return
}

var lc = middleware.Locale(w, req)
var store = dataStore{
Expand Down