phares3757/gatus
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor uselessly complex code

Browse Source
This commit is contained in:
TwinProduction 2021-07-12 01:06:44 -04:00 committed by Chris
parent bd1eb7c61b
commit 9c8bf2b69e
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
storage/store/database/database.go
View File

@ -175,13 +175,13 @@ func (s *Store) getResultsByServiceID(serviceID int64) (results []*core.Result,
if err != nil { if err != nil {
return nil, err return nil, err
} }
idConditionResultsMap := make(map[int64]*[]*core.ConditionResult) idResultMap := make(map[int64]*core.Result)
for rows.Next() { for rows.Next() {
result := &core.Result{} result := &core.Result{}
var id int64 var id int64
_ = rows.Scan(&id, &result.Success, &result.Connected, &result.HTTPStatus, &result.DNSRCode, &result.CertificateExpiration, &result.Hostname, &result.IP, &result.Duration, &result.Timestamp) _ = rows.Scan(&id, &result.Success, &result.Connected, &result.HTTPStatus, &result.DNSRCode, &result.CertificateExpiration, &result.Hostname, &result.IP, &result.Duration, &result.Timestamp)
results = append(results, result) results = append(results, result)
idConditionResultsMap[id] = &result.ConditionResults idResultMap[id] = result
} }
_ = rows.Close() _ = rows.Close()
// Get the conditionResults // Get the conditionResults
@ -189,7 +189,7 @@ func (s *Store) getResultsByServiceID(serviceID int64) (results []*core.Result,
if err != nil { if err != nil {
return return
} }
for serviceResultID, conditionResults := range idConditionResultsMap { for serviceResultID, result := range idResultMap {
rows, err = transaction.Query(` rows, err = transaction.Query(`
SELECT service_result_id, condition, success SELECT service_result_id, condition, success
FROM service_result_condition FROM service_result_condition
@ -201,11 +201,10 @@ func (s *Store) getResultsByServiceID(serviceID int64) (results []*core.Result,
return return
} }
for rows.Next() { for rows.Next() {
var id int64
conditionResult := &core.ConditionResult{} conditionResult := &core.ConditionResult{}
_ = rows.Scan(&id, &conditionResult.Condition, &conditionResult.Success) //var id int64
*conditionResults = append(*conditionResults, conditionResult) _ = rows.Scan(&conditionResult.Condition, &conditionResult.Success)
// XXX: profile this ^ result.ConditionResults = append(result.ConditionResults, conditionResult)
} }
_ = rows.Close() _ = rows.Close()
} }