Renaming method back to sustain plugin api backwards compatibility.

Graylog2 · May 6, 2015 · 516f522 · 516f522
1 parent bc83b85
commit 516f522
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/graylog2-plugin-interfaces/src/main/java/org/graylog2/plugin/alarms/AlertCondition.java b/graylog2-plugin-interfaces/src/main/java/org/graylog2/plugin/alarms/AlertCondition.java
@@ -45,7 +45,7 @@ public interface AlertCondition {
 
     Map<String, Object> getParameters();
 
-    Integer getBacklogSize();
+    Integer getBacklog();
 
     int getGrace();
 

diff --git a/graylog2-server/src/main/java/org/graylog2/alarmcallbacks/EmailAlarmCallback.java b/graylog2-server/src/main/java/org/graylog2/alarmcallbacks/EmailAlarmCallback.java
@@ -62,7 +62,7 @@ public void call(Stream stream, AlertCondition.CheckResult result) {
         AlertCondition alertCondition = result.getTriggeredCondition();
         if (stream.getAlertReceivers().size() > 0) {
             try {
-                if (alertCondition.getBacklogSize() > 0 && result.getMatchingMessages() != null) {
+                if (alertCondition.getBacklog() > 0 && result.getMatchingMessages() != null) {
                     alertSender.sendEmails(stream, result, getAlarmBacklog(result));
                 } else {
                     alertSender.sendEmails(stream, result);
@@ -98,7 +98,7 @@ public void call(Stream stream, AlertCondition.CheckResult result) {
     protected List<Message> getAlarmBacklog(AlertCondition.CheckResult result) {
         final AlertCondition alertCondition = result.getTriggeredCondition();
         final List<MessageSummary> backlogSummaries = result.getMatchingMessages()
-                .subList(0, Math.min(alertCondition.getBacklogSize(), result.getMatchingMessages().size()));
+                .subList(0, Math.min(alertCondition.getBacklog(), result.getMatchingMessages().size()));
         final List<Message> backlog = Lists.newArrayList();
 
         for (MessageSummary messageSummary : backlogSummaries) {

diff --git a/graylog2-server/src/main/java/org/graylog2/alerts/AbstractAlertCondition.java b/graylog2-server/src/main/java/org/graylog2/alerts/AbstractAlertCondition.java
@@ -106,7 +106,7 @@ public Map<String, Object> getParameters() {
     }
 
     @Override
-    public Integer getBacklogSize() {
+    public Integer getBacklog() {
         final Object rawParameter = getParameters().get("backlog");
         if (rawParameter != null && rawParameter instanceof Number) {
             return (Integer) rawParameter;

diff --git a/graylog2-server/src/main/java/org/graylog2/alerts/types/FieldValueAlertCondition.java b/graylog2-server/src/main/java/org/graylog2/alerts/types/FieldValueAlertCondition.java
@@ -146,7 +146,7 @@ protected CheckResult runCheck() {
                         + thresholdType + " than " + decimalFormat.format(threshold) + ". "
                         + "(Current grace time: " + grace + " minutes)";
 
-                if (getBacklogSize() > 0) {
+                if (getBacklog() > 0) {
                     for (ResultMessage resultMessage : fieldStatsResult.getSearchHits()) {
                         final Message msg = new Message(resultMessage.getMessage());
                         summaries.add(new MessageSummary(resultMessage.getIndex(), msg));

diff --git a/graylog2-server/src/main/java/org/graylog2/alerts/types/MessageCountAlertCondition.java b/graylog2-server/src/main/java/org/graylog2/alerts/types/MessageCountAlertCondition.java
@@ -99,8 +99,8 @@ protected CheckResult runCheck() {
 
             if (triggered) {
                 final List<MessageSummary> summaries = Lists.newArrayList();
-                if (getBacklogSize() > 0) {
+                if (getBacklog() > 0) {
-                    final SearchResult backlogResult = searches.search("*", filter, new RelativeRange(time * 60), getBacklogSize(), 0, new Sorting("timestamp", Sorting.Direction.DESC));
+                    final SearchResult backlogResult = searches.search("*", filter, new RelativeRange(time * 60), getBacklog(), 0, new Sorting("timestamp", Sorting.Direction.DESC));
                     for (ResultMessage resultMessage : backlogResult.getResults()) {
                         final Message msg = new Message(resultMessage.getMessage());
                         summaries.add(new MessageSummary(resultMessage.getIndex(), msg));