admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wrap error messages

Browse Source 
Signed-off-by: huanggze <loganhuang@yunify.com>
This commit is contained in:
huanggze
2019-07-04 20:28:58 +08:00
committed by zryfish
parent d16aee1176
commit 78f9e1b74d
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/simple/client/elasticsearch/esclient.go
View File

@@ -557,7 +557,7 @@ func Query(param QueryParameters) *QueryResult {
operation, query, err := createQueryRequest(param)
if err != nil {
queryResult = new(QueryResult)
queryResult.Status = http.StatusNotFound
queryResult.Status = http.StatusInternalServerError
queryResult.Error = err.Error()
return queryResult
}
@@ -565,7 +565,7 @@ func Query(param QueryParameters) *QueryResult {
es := readESConfigs()
if es == nil {
queryResult = new(QueryResult)
queryResult.Status = http.StatusNotFound
queryResult.Status = http.StatusInternalServerError
queryResult.Error = "Elasticsearch configurations not found. Please check if they are properly configured."
return queryResult
}
@@ -576,7 +576,7 @@ func Query(param QueryParameters) *QueryResult {
if err != nil {
glog.Errorln(err)
queryResult = new(QueryResult)
queryResult.Status = http.StatusNotFound
queryResult.Status = http.StatusInternalServerError
queryResult.Error = err.Error()
return queryResult
}
@@ -586,7 +586,7 @@ func Query(param QueryParameters) *QueryResult {
if err != nil {
glog.Errorln(err)
queryResult = new(QueryResult)
queryResult.Status = http.StatusNotFound
queryResult.Status = http.StatusInternalServerError
queryResult.Error = err.Error()
return queryResult
}
@@ -596,7 +596,7 @@ func Query(param QueryParameters) *QueryResult {
if err != nil {
glog.Errorln(err)
queryResult = new(QueryResult)
queryResult.Status = http.StatusNotFound
queryResult.Status = http.StatusInternalServerError
queryResult.Error = err.Error()
return queryResult
}