Improve logging to include more identifiable information for Listeners

Author: vishesh92

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -29,6 +29,7 @@
 import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event;
 import org.apache.cloudstack.util.CPUArchConverter;
 import org.apache.cloudstack.util.HypervisorTypeConverter;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 import javax.persistence.Column;
 import javax.persistence.Convert;
@@ -264,4 +265,11 @@ public void setArch(CPU.CPUArch arch) {
     public PartitionType partitionType() {
         return PartitionType.Cluster;
     }
+
+    @Override
+    public String toString() {
+        return String.format("EngineCluster %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "name", "uuid"));
+    }
 }

engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineClusterVO.java

@@ -43,6 +43,7 @@
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.db.GenericDao;
 import com.cloud.utils.db.StateMachine;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 @Entity
 @Table(name = "data_center")
@@ -523,4 +524,11 @@ public PartitionType partitionType() {
     public DataCenter.Type getType() {
         return type;
     }
+
+    @Override
+    public String toString() {
+        return String.format("EngineDataCenter %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "name", "uuid"));
+    }
 }

engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java

@@ -53,6 +53,7 @@
 import com.cloud.utils.db.StateMachine;
 import org.apache.cloudstack.util.CPUArchConverter;
 import org.apache.cloudstack.util.HypervisorTypeConverter;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 @Entity
 @Table(name = "host")
@@ -697,7 +698,9 @@ public boolean equals(Object obj) {
 
     @Override
     public String toString() {
-        return new StringBuilder("Host[").append("-").append(id).append("-").append(type).append("]").toString();
+        return String.format("EngineHost %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "name", "uuid", "type"));
     }
 
     public void setHypervisorType(HypervisorType hypervisorType) {

engine/orchestration/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java

@@ -201,7 +201,8 @@ public void setUuid(String uuid) {
 
     @Override
     public String toString() {
-        return String.format("HostPod %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
-                this, "id", "name", "uuid"));
+        return String.format("HostPod %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "name", "uuid"));
     }
 }

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

@@ -32,6 +32,7 @@
 
 import com.cloud.network.Site2SiteVpnConnection;
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 
 @Entity
@@ -182,4 +183,11 @@ public Class<?> getEntityType() {
     public String getName() {
         return null;
     }
+
+    @Override
+    public String toString() {
+        return String.format("Site2SiteVpnConnection %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "uuid", "state"));
+    }
 }

engine/schema/src/main/java/com/cloud/dc/HostPodVO.java

@@ -36,6 +36,7 @@
 
 import com.cloud.utils.db.GenericDao;
 import com.cloud.utils.net.NetUtils;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 @Entity
 @Table(name = "firewall_rules")
@@ -258,7 +259,9 @@ public FirewallRuleVO(String xId, Long ipAddressId, Integer portStart, Integer p
 
     @Override
     public String toString() {
-        return new StringBuilder("Rule[").append(id).append("-").append(purpose).append("-").append(state).append("]").toString();
+        return String.format("FirewallRule %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "uuid", "purpose", "state"));
     }
 
     @Override

engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnConnectionVO.java

@@ -28,6 +28,7 @@
 import javax.persistence.Transient;
 
 import com.cloud.utils.db.GenericDao;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 @Entity
 @Table(name = "vpc")
@@ -210,8 +211,9 @@ public void setDisplayText(final String displayText) {
 
     @Override
     public String toString() {
-        final StringBuilder buf = new StringBuilder("[VPC [");
-        return buf.append(id).append("-").append(name).append("]").toString();
+        return String.format("VPC %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "uuid", "name"));
     }
 
     @Override

engine/schema/src/main/java/com/cloud/network/rules/FirewallRuleVO.java

@@ -572,7 +572,9 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return String.format("Template %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "id", "uniqueName", "format"));
+        return String.format("Template %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "uuid", "name", "uniqueName", "format"));
     }
 
     public void setRemoved(Date removed) {