issue #82 - remove monitors

codeine-cd · Feb 10, 2015 · 6431dfc · 6431dfc
1 parent f9ada96
commit 6431dfc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/src/common/codeine/jsons/mails/CollectorNotificationJson.java b/src/common/codeine/jsons/mails/CollectorNotificationJson.java
@@ -20,8 +20,6 @@ public class CollectorNotificationJson {
 	private String peer;
 	private Integer exit_status;
 	private String duration;
-	//TODO remove
-	private boolean is_for_collector;
 	private String notification_id;
 	private int notifications_in_24h;
 	public CollectorNotificationJson(){
@@ -41,7 +39,6 @@ public CollectorNotificationJson(String collector_name, String project_name, Str
 		this.time_formatted = StringUtils.formatDate(this.time);
 		this.collection_type = AlertsCollectionType.NotCollected.toLong();
 		this.peer = peer;
-		this.is_for_collector = is_for_collector;
 		notification_id = project_name + "_" + node_name + "_" + collector_name;
 		this.notifications_in_24h = notifications_in_24h;
 	}
@@ -116,10 +113,6 @@ public String toStringNoOutput() {
 				+ peer + "]";
 	}
 
-	public boolean is_for_collector() {
-		return is_for_collector;
-	}
-
 	public String notification_id() {
 		return notification_id;
 	}

diff --git a/src/web_server/codeine/mail/AggregateMailPrepare.java b/src/web_server/codeine/mail/AggregateMailPrepare.java
@@ -91,11 +91,7 @@ public List<Mail> prepare(List<NotificationContent> notificationContent, AlertsC
 	}
 
 	private String getLink(CollectorNotificationJson notification) {
-		if (notification.is_for_collector()) {
-			return links.getWebServerCollectorStatus(notification.project_name(), notification.node_name(), notification.collector_name());
-		} else {
-			return links.getWebServerMonitorStatus(notification.project_name(), notification.node_name(), notification.collector_name());
-		}
+		return links.getWebServerCollectorStatus(notification.project_name(), notification.node_name(), notification.collector_name());
 	}
 
 	private String getTimeOnNode(CollectorNotificationJson notification) {