Skip to content

Commit

Permalink
Fix nil checking on typed interface (#17598)
Browse files Browse the repository at this point in the history
* Fix nil checking on typed interface

- Partially resoles #17596
- Resolves SA4023 errors.
- Ensure correctly that typed interface are nil.

* Remove unnecessary code

`NewBleveIndexer` will never return nil, even on errors.

* Patch `NewBleveIndexer`

* Fix low-level functions

* Remove deadcode

* Fix GetSession

* Close Elastic search when err isn't nil

* Update elastic_search.go

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
  • Loading branch information
3 people committed Nov 15, 2021
1 parent 253d9e4 commit ab13797
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 15 deletions.
4 changes: 4 additions & 0 deletions modules/indexer/code/bleve.go
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
5 changes: 4 additions & 1 deletion modules/indexer/code/elastic_search.go
Expand Up @@ -82,7 +82,10 @@ func NewElasticSearchIndexer(url, indexerName string) (*ElasticSearchIndexer, bo
indexerAliasName: indexerName,
}
exists, err := indexer.init()

if err != nil {
indexer.Close()
return nil, false, err
}
return indexer, !exists, err
}

Expand Down
6 changes: 0 additions & 6 deletions modules/indexer/code/indexer.go
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
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

0 comments on commit ab13797

Please sign in to comment.