Merge pull request #29 from ernestio/ernest/323

[#ERNEST-323] : Do not track non final messages
ernestio · Mar 17, 2017 · cf83851 · cf83851
2 parents 45ceefe + e86b62f
commit cf83851
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 0 deletions.
diff --git a/c_ebs_volume.go b/c_ebs_volume.go
@@ -35,6 +35,9 @@ func (n *EBSVolume) getSingleDetail(c component, prefix string) (lines []Message
 	if status == "errored" {
 		level = "ERROR"
 	}
+	if status != "errored" && status != "completed" {
+		return lines
+	}
 	lines = append(lines, Message{Body: " " + name, Level: level})
 	id, _ := c["volume_aws_id"].(string)
 	if id != "" {

diff --git a/c_elb.go b/c_elb.go
@@ -38,6 +38,9 @@ func (n *ELB) getSingleDetail(c component, prefix string) (lines []Message) {
 	if status == "errored" {
 		level = "ERROR"
 	}
+	if status != "errored" && status != "completed" {
+		return lines
+	}
 	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
 	if c["dns_name"] != nil {

diff --git a/c_firewall.go b/c_firewall.go
@@ -37,6 +37,9 @@ func (n *Firewall) getSingleDetail(c component, prefix string) (lines []Message)
 	if status == "errored" {
 		level = "ERROR"
 	}
+	if status != "errored" && status != "completed" {
+		return lines
+	}
 	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
 	if status == "errored" {

diff --git a/c_instance.go b/c_instance.go
@@ -38,6 +38,9 @@ func (n *Instance) getSingleDetail(c component, prefix string) (lines []Message)
 	if status == "errored" {
 		level = "ERROR"
 	}
+	if status != "errored" && status != "completed" {
+		return lines
+	}
 	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   IP        : " + ip, Level: ""})
 	publicIP, _ := c["public_ip"].(string)

diff --git a/c_nat.go b/c_nat.go
@@ -37,6 +37,9 @@ func (n *Nat) getSingleDetail(c component, prefix string) (lines []Message) {
 	if status == "errored" {
 		level = "ERROR"
 	}
+	if status != "errored" && status != "completed" {
+		return lines
+	}
 	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})
 	if status == "errored" {

diff --git a/c_network.go b/c_network.go
@@ -36,6 +36,9 @@ func (n *Network) getSingleDetail(c component, prefix string) (lines []Message)
 	if status == "errored" {
 		level = "ERROR"
 	}
+	if status != "errored" && status != "completed" {
+		return lines
+	}
 	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   IP     : " + ip, Level: ""})
 	id, _ := c["network_aws_id"].(string)

diff --git a/c_rds_cluster.go b/c_rds_cluster.go
@@ -39,6 +39,9 @@ func (n *RDSCluster) getSingleDetail(c component, prefix string) (lines []Messag
 	if status == "errored" {
 		level = "ERROR"
 	}
+	if status != "errored" && status != "completed" {
+		return lines
+	}
 	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   Engine    : " + engine, Level: ""})
 	lines = append(lines, Message{Body: "   Endpoint  : " + endpoint, Level: ""})

diff --git a/c_rds_instance.go b/c_rds_instance.go
@@ -40,6 +40,9 @@ func (n *RDSInstance) getSingleDetail(c component, prefix string) (lines []Messa
 	if status == "errored" {
 		level = "ERROR"
 	}
+	if status != "errored" && status != "completed" {
+		return lines
+	}
 	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   Engine    : " + engine, Level: ""})
 	lines = append(lines, Message{Body: "   Cluster   : " + cluster, Level: ""})

diff --git a/c_router.go b/c_router.go
@@ -34,6 +34,9 @@ func (n *Router) getSingleDetail(c component, prefix string) (lines []Message) {
 	if status == "errored" {
 		level = "ERROR"
 	}
+	if status != "errored" && status != "completed" {
+		return lines
+	}
 	ip, _ := c["ip"].(string)
 	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   IP        : " + ip, Level: ""})

diff --git a/c_s3.go b/c_s3.go
@@ -41,6 +41,9 @@ func (n *S3Bucket) getSingleDetail(c component, prefix string) (lines []Message)
 	if status == "errored" {
 		level = "ERROR"
 	}
+	if status != "errored" && status != "completed" {
+		return lines
+	}
 	lines = append(lines, Message{Body: " " + name, Level: level})
 	lines = append(lines, Message{Body: "   ACL       : " + acl, Level: ""})
 	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})

diff --git a/c_vpc.go b/c_vpc.go
@@ -38,6 +38,9 @@ func (n *Vpc) getSingleDetail(c component, prefix string) (lines []Message) {
 	if status == "errored" {
 		level = "ERROR"
 	}
+	if status != "errored" && status != "completed" {
+		return lines
+	}
 	lines = append(lines, Message{Body: " " + id, Level: level})
 	lines = append(lines, Message{Body: "   Subnet    : " + subnet, Level: ""})
 	lines = append(lines, Message{Body: "   Status    : " + status, Level: ""})