mirrors/gatus
1
0
Fork 0
mirror of https://github.com/TwiN/gatus.git synced 2026-02-12 04:09:01 +00:00
Code Activity

refactor: Simplify and modernize loops (#1522)

Browse Source 
* refactor: Simplify loops

* refactor: Modernize loops using range over int

---------

Co-authored-by: TwiN <twin@linux.com>
This commit is contained in:
PythonGermany
2026-02-09 01:08:59 +01:00
committed by GitHub
parent e5b4e0d381
commit f09d959c97
17 changed files with 45 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
storage/store/memory/memory.go
View File

@@ -1,6 +1,7 @@
package memory
import (
"slices"
"sort"
"sync"
"time"
@@ -237,13 +238,7 @@ func (s *Store) InsertSuiteResult(su *suite.Suite, result *suite.Result) error {
func (s *Store) DeleteAllEndpointStatusesNotInKeys(keys []string) int {
var keysToDelete []string
for _, existingKey := range s.endpointCache.GetKeysByPattern("*", 0) {
shouldDelete := true
for _, k := range keys {
if existingKey == k {
shouldDelete = false
break
}
}
shouldDelete := !slices.Contains(keys, existingKey)
if shouldDelete {
keysToDelete = append(keysToDelete, existingKey)
}

22
storage/store/memory/memory_test.go
View File

@@ -797,7 +797,7 @@ func TestSuiteResultOrdering(t *testing.T) {
baseTime := time.Now().Add(-5 * time.Hour)
timestamps := make([]time.Time, 5)
for i := 0; i < 5; i++ {
for i := range 5 {
timestamp := baseTime.Add(time.Duration(i) * time.Hour)
timestamps[i] = timestamp
result := &suite.Result{
@@ -878,7 +878,7 @@ func TestSuiteResultOrdering(t *testing.T) {
smallSuite := &suite.Suite{Name: "small-suite", Group: "test"}
// Insert 6 results, should keep only the newest 3
for i := 0; i < 6; i++ {
for i := range 6 {
result := &suite.Result{
Name: smallSuite.Name,
Group: smallSuite.Group,
@@ -925,7 +925,7 @@ func TestStore_ConcurrentAccess(t *testing.T) {
// Create endpoints for concurrent testing
endpoints := make([]*endpoint.Endpoint, numGoroutines)
for i := 0; i < numGoroutines; i++ {
for i := range numGoroutines {
endpoints[i] = &endpoint.Endpoint{
Name: "endpoint-" + string(rune('A'+i)),
Group: "concurrent",
@@ -934,12 +934,12 @@ func TestStore_ConcurrentAccess(t *testing.T) {
}
// Concurrently insert results for different endpoints
for i := 0; i < numGoroutines; i++ {
for i := range numGoroutines {
wg.Add(1)
go func(endpointIndex int) {
defer wg.Done()
ep := endpoints[endpointIndex]
for j := 0; j < resultsPerGoroutine; j++ {
for j := range resultsPerGoroutine {
result := &endpoint.Result{
Success: j%2 == 0,
Timestamp: time.Now().Add(time.Duration(j) * time.Minute),
@@ -978,7 +978,7 @@ func TestStore_ConcurrentAccess(t *testing.T) {
// Create suites for concurrent testing
suites := make([]*suite.Suite, numGoroutines)
for i := 0; i < numGoroutines; i++ {
for i := range numGoroutines {
suites[i] = &suite.Suite{
Name: "suite-" + string(rune('A'+i)),
Group: "concurrent",
@@ -986,12 +986,12 @@ func TestStore_ConcurrentAccess(t *testing.T) {
}
// Concurrently insert results for different suites
for i := 0; i < numGoroutines; i++ {
for i := range numGoroutines {
wg.Add(1)
go func(suiteIndex int) {
defer wg.Done()
su := suites[suiteIndex]
for j := 0; j < resultsPerGoroutine; j++ {
for j := range resultsPerGoroutine {
result := &suite.Result{
Name: su.Name,
Group: su.Group,
@@ -1036,7 +1036,7 @@ func TestStore_ConcurrentAccess(t *testing.T) {
wg.Add(1)
go func() {
defer wg.Done()
for i := 0; i < 5; i++ {
for i := range 5 {
result := &endpoint.Result{
Success: true,
Timestamp: time.Now(),
@@ -1050,7 +1050,7 @@ func TestStore_ConcurrentAccess(t *testing.T) {
wg.Add(1)
go func() {
defer wg.Done()
for i := 0; i < 5; i++ {
for i := range 5 {
result := &suite.Result{
Name: testSuite.Name,
Group: testSuite.Group,
@@ -1066,7 +1066,7 @@ func TestStore_ConcurrentAccess(t *testing.T) {
wg.Add(1)
go func() {
defer wg.Done()
for i := 0; i < 10; i++ {
for range 10 {
store.GetAllEndpointStatuses(&paging.EndpointStatusParams{})
store.GetAllSuiteStatuses(&paging.SuiteStatusParams{})
time.Sleep(1 * time.Millisecond)

4
storage/store/memory/util_bench_test.go
View File

@@ -11,10 +11,10 @@ import (
func BenchmarkShallowCopyEndpointStatus(b *testing.B) {
ep := &testEndpoint
status := endpoint.NewStatus(ep.Group, ep.Name)
for i := 0; i < storage.DefaultMaximumNumberOfResults; i++ {
for range storage.DefaultMaximumNumberOfResults {
AddResult(status, &testSuccessfulResult, storage.DefaultMaximumNumberOfResults, storage.DefaultMaximumNumberOfEvents)
}
for n := 0; n < b.N; n++ {
for b.Loop() {
ShallowCopyEndpointStatus(status, paging.NewEndpointStatusParams().WithResults(1, 20))
}
b.ReportAllocs()

9
storage/store/memory/util_test.go
View File

@@ -13,7 +13,7 @@ import (
func TestAddResult(t *testing.T) {
ep := &endpoint.Endpoint{Name: "name", Group: "group"}
endpointStatus := endpoint.NewStatus(ep.Group, ep.Name)
for i := 0; i < (storage.DefaultMaximumNumberOfResults+storage.DefaultMaximumNumberOfEvents)*2; i++ {
for i := range (storage.DefaultMaximumNumberOfResults + storage.DefaultMaximumNumberOfEvents) * 2 {
AddResult(endpointStatus, &endpoint.Result{Success: i%2 == 0, Timestamp: time.Now()}, storage.DefaultMaximumNumberOfResults, storage.DefaultMaximumNumberOfEvents)
}
if len(endpointStatus.Results) != storage.DefaultMaximumNumberOfResults {
@@ -30,7 +30,7 @@ func TestShallowCopyEndpointStatus(t *testing.T) {
ep := &endpoint.Endpoint{Name: "name", Group: "group"}
endpointStatus := endpoint.NewStatus(ep.Group, ep.Name)
ts := time.Now().Add(-25 * time.Hour)
for i := 0; i < 25; i++ {
for i := range 25 {
AddResult(endpointStatus, &endpoint.Result{Success: i%2 == 0, Timestamp: ts}, storage.DefaultMaximumNumberOfResults, storage.DefaultMaximumNumberOfEvents)
ts = ts.Add(time.Hour)
}
@@ -74,9 +74,9 @@ func TestShallowCopySuiteStatus(t *testing.T) {
Key: testSuite.Key(),
Results: []*suite.Result{},
}
ts := time.Now().Add(-25 * time.Hour)
for i := 0; i < 25; i++ {
for i := range 25 {
result := &suite.Result{
Name: testSuite.Name,
Group: testSuite.Group,
@@ -169,4 +169,3 @@ func TestShallowCopySuiteStatus(t *testing.T) {
}
})
}