Resolve conflicts

damnever · damnever · commit 364c50c0156a · 2024-03-12T17:34:17.000+08:00
Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com>
diff --git a/provider/mem/mem.go b/provider/mem/mem.go
@@ -134,7 +134,7 @@ func (a *Alerts) gc() {
 		// they are resolved. Alerts waiting for resolved notifications are
 		// held in memory in aggregation groups redundantly.
 		a.marker.Delete(alert.Fingerprint())
-		a.callback.PostDelete(alert)
+		a.callback.PostDelete(&alert)
 	}
 
 	for i, l := range a.listeners {
diff --git a/store/store.go b/store/store.go
@@ -70,7 +70,7 @@ func (a *Alerts) Run(ctx context.Context, interval time.Duration) {
 }
 
 // GC deletes resolved alerts and returns them.
-func (a *Alerts) GC() []*types.Alert {
+func (a *Alerts) GC() []types.Alert {
 	a.Lock()
 	var resolved []types.Alert
 	for fp, alert := range a.c {

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func (a *Alerts) gc() {`
`134`	`134`	`// they are resolved. Alerts waiting for resolved notifications are`
`135`	`135`	`// held in memory in aggregation groups redundantly.`
`136`	`136`	`a.marker.Delete(alert.Fingerprint())`
`137`		`- a.callback.PostDelete(alert)`
	`137`	`+ a.callback.PostDelete(&alert)`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`for i, l := range a.listeners {`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func (a *Alerts) Run(ctx context.Context, interval time.Duration) {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`// GC deletes resolved alerts and returns them.`
`73`		`-func (a Alerts) GC() []types.Alert {`
	`73`	`+func (a *Alerts) GC() []types.Alert {`
`74`	`74`	`a.Lock()`
`75`	`75`	`var resolved []types.Alert`
`76`	`76`	`for fp, alert := range a.c {`