RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-28 00:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1158 from prometheus/stn/api-update-locks

Browse Source 
Lock around variables used in Update()
This commit is contained in:
Frederic Branczyk 2017-12-21 13:06:23 +01:00 committed by GitHub
commit db8386fd68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/api.go
View File

@ -331,6 +331,7 @@ func (api *API) listAlerts(w http.ResponseWriter, r *http.Request) {
alerts := api.alerts.GetPending()
defer alerts.Close()
api.mtx.RLock()
// TODO(fabxc): enforce a sensible timeout.
for a := range alerts.Next() {
if err = alerts.Err(); err != nil {
@ -375,6 +376,7 @@ func (api *API) listAlerts(w http.ResponseWriter, r *http.Request) {
res = append(res, apiAlert)
}
api.mtx.Unlock()
if err != nil {
api.respondError(w, apiError{
@ -457,6 +459,10 @@ func (api *API) addAlerts(w http.ResponseWriter, r *http.Request) {
func (api *API) insertAlerts(w http.ResponseWriter, r *http.Request, alerts ...*types.Alert) {
now := time.Now()
api.mtx.RLock()
resolveTimeout := api.resolveTimeout
api.mtx.RUnlock()
for _, alert := range alerts {
alert.UpdatedAt = now
@ -468,7 +474,7 @@ func (api *API) insertAlerts(w http.ResponseWriter, r *http.Request, alerts ...*
// is marked resolved if it is not updated.
if alert.EndsAt.IsZero() {
alert.Timeout = true
alert.EndsAt = now.Add(api.resolveTimeout)
alert.EndsAt = now.Add(resolveTimeout)
numReceivedAlerts.WithLabelValues("firing").Inc()
} else {