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

Minor improvements

Browse Source
This commit is contained in:
TwinProduction 2021-01-04 18:28:12 -05:00
parent c27cb7af08
commit 4ff391bcf3
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
storage/memory.go
View File

@ -26,16 +26,14 @@ func NewInMemoryStore() *InMemoryStore {
func (ims *InMemoryStore) GetAll() map[string]*core.ServiceStatus { func (ims *InMemoryStore) GetAll() map[string]*core.ServiceStatus {
results := make(map[string]*core.ServiceStatus, len(ims.serviceStatuses)) results := make(map[string]*core.ServiceStatus, len(ims.serviceStatuses))
ims.serviceResultsMutex.RLock() ims.serviceResultsMutex.RLock()
for key, svcStatus := range ims.serviceStatuses { for key, serviceStatus := range ims.serviceStatuses {
copiedResults := copyResults(svcStatus.Results)
results[key] = &core.ServiceStatus{ results[key] = &core.ServiceStatus{
Name: svcStatus.Name, Name: serviceStatus.Name,
Group: svcStatus.Group, Group: serviceStatus.Group,
Results: copiedResults, Results: copyResults(serviceStatus.Results),
} }
} }
ims.serviceResultsMutex.RUnlock() ims.serviceResultsMutex.RUnlock()
return results return results
} }
@ -62,11 +60,8 @@ func (ims *InMemoryStore) Insert(service *core.Service, result *core.Result) {
} }
func copyResults(results []*core.Result) []*core.Result { func copyResults(results []*core.Result) []*core.Result {
copiedResults := []*core.Result{} var copiedResults []*core.Result
for _, result := range results { for _, result := range results {
copiedErrors := copyErrors(result.Errors)
copiedConditionResults := copyConditionResults(result.ConditionResults)
copiedResults = append(copiedResults, &core.Result{ copiedResults = append(copiedResults, &core.Result{
HTTPStatus: result.HTTPStatus, HTTPStatus: result.HTTPStatus,
DNSRCode: result.DNSRCode, DNSRCode: result.DNSRCode,
@ -75,8 +70,8 @@ func copyResults(results []*core.Result) []*core.Result {
IP: result.IP, IP: result.IP,
Connected: result.Connected, Connected: result.Connected,
Duration: result.Duration, Duration: result.Duration,
Errors: copiedErrors, Errors: copyErrors(result.Errors),
ConditionResults: copiedConditionResults, ConditionResults: copyConditionResults(result.ConditionResults),
Success: result.Connected, Success: result.Connected,
Timestamp: result.Timestamp, Timestamp: result.Timestamp,
CertificateExpiration: result.CertificateExpiration, CertificateExpiration: result.CertificateExpiration,
@ -85,22 +80,21 @@ func copyResults(results []*core.Result) []*core.Result {
return copiedResults return copiedResults
} }
func copyConditionResults(crs []*core.ConditionResult) []*core.ConditionResult { func copyConditionResults(conditionResults []*core.ConditionResult) []*core.ConditionResult {
copiedConditionResults := []*core.ConditionResult{} var copiedConditionResults []*core.ConditionResult
for _, conditionResult := range crs { for _, conditionResult := range conditionResults {
copiedConditionResults = append(copiedConditionResults, &core.ConditionResult{ copiedConditionResults = append(copiedConditionResults, &core.ConditionResult{
Condition: conditionResult.Condition, Condition: conditionResult.Condition,
Success: conditionResult.Success, Success: conditionResult.Success,
}) })
} }
return copiedConditionResults return copiedConditionResults
} }
func copyErrors(errors []string) []string { func copyErrors(errors []string) []string {
copiedErrors := []string{} var copiedErrors []string
for _, error := range errors { for _, err := range errors {
copiedErrors = append(copiedErrors, error) copiedErrors = append(copiedErrors, err)
} }
return copiedErrors return copiedErrors
} }