feat(alerting): minor fixes

torkelo · torkelo · commit 77a5e3f14dd4 · 2016-06-11T11:54:46.000+02:00
diff --git a/pkg/services/alerting/commands.go b/pkg/services/alerting/commands.go
@@ -25,13 +25,13 @@ func updateDashboardAlerts(cmd *UpdateDashboardAlertsCommand) error {
 
 	extractor := NewDashAlertExtractor(cmd.Dashboard, cmd.OrgId)
 
-	alerts, err := extractor.GetRuleModels()
-	if err != nil {
+	if alerts, err := extractor.GetAlerts(); err != nil {
 		return err
+	} else {
+		saveAlerts.Alerts = alerts
 	}
 
-	saveAlerts.Alerts = alerts
-	if bus.Dispatch(&saveAlerts); err != nil {
+	if err := bus.Dispatch(&saveAlerts); err != nil {
 		return err
 	}
 
diff --git a/pkg/services/alerting/extractor.go b/pkg/services/alerting/extractor.go
@@ -47,7 +47,8 @@ func (e *DashAlertExtractor) lookupDatasourceId(dsName string) (int64, error) {
 	return 0, errors.New("Could not find datasource id for " + dsName)
 }
 
-func (e *DashAlertExtractor) GetRuleModels() ([]*m.Alert, error) {
+func (e *DashAlertExtractor) GetAlerts() ([]*m.Alert, error) {
+	e.log.Debug("GetAlerts")
 
 	alerts := make([]*m.Alert, 0)
 
@@ -116,5 +117,6 @@ func (e *DashAlertExtractor) GetRuleModels() ([]*m.Alert, error) {
 		}
 	}
 
+	e.log.Debug("Extracted alerts from dashboard", "alertCount", len(alerts))
 	return alerts, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,13 @@ func updateDashboardAlerts(cmd *UpdateDashboardAlertsCommand) error {`
`25`	`25`
`26`	`26`	`extractor := NewDashAlertExtractor(cmd.Dashboard, cmd.OrgId)`
`27`	`27`
`28`		`- alerts, err := extractor.GetRuleModels()`
`29`		`- if err != nil {`
	`28`	`+ if alerts, err := extractor.GetAlerts(); err != nil {`
`30`	`29`	`return err`
	`30`	`+ } else {`
	`31`	`+ saveAlerts.Alerts = alerts`
`31`	`32`	`}`
`32`	`33`
`33`		`- saveAlerts.Alerts = alerts`
`34`		`- if bus.Dispatch(&saveAlerts); err != nil {`
	`34`	`+ if err := bus.Dispatch(&saveAlerts); err != nil {`
`35`	`35`	`return err`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ func (e *DashAlertExtractor) lookupDatasourceId(dsName string) (int64, error) {`
`47`	`47`	`return 0, errors.New("Could not find datasource id for " + dsName)`
`48`	`48`	`}`
`49`	`49`
`50`		`-func (e DashAlertExtractor) GetRuleModels() ([]m.Alert, error) {`
	`50`	`+func (e DashAlertExtractor) GetAlerts() ([]m.Alert, error) {`
	`51`	`+ e.log.Debug("GetAlerts")`
`51`	`52`
`52`	`53`	`alerts := make([]*m.Alert, 0)`
`53`	`54`
`@@ -116,5 +117,6 @@ func (e DashAlertExtractor) GetRuleModels() ([]m.Alert, error) {`
`116`	`117`	`}`
`117`	`118`	`}`
`118`	`119`
	`120`	`+ e.log.Debug("Extracted alerts from dashboard", "alertCount", len(alerts))`
`119`	`121`	`return alerts, nil`
`120`	`122`	`}`