Greg Padgett has uploaded a new change for review. Change subject: core: add toString method to storage_server_connections (#843112) ......................................................................
core: add toString method to storage_server_connections (#843112) https://bugzilla.redhat.com/843112 Querying storage connections from VDS resulted in log messages with only object references; now connection details are logged instead. Only fields with non-empty values are logged for brevity; in the case of bz843112 this prevents the empty username and the null nfs values from polluting the log. Change-Id: I711f3bfb250ae6b9d5e80066a2a5647b55c382da Signed-off-by: Greg Padgett <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_server_connections.java 1 file changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/7460/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_server_connections.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_server_connections.java index 7074de4..f2d3a65 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_server_connections.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_server_connections.java @@ -1,6 +1,8 @@ package org.ovirt.engine.core.common.businessentities; import java.io.Serializable; +import java.util.Map; +import java.util.LinkedHashMap; import javax.persistence.Column; import javax.persistence.Entity; @@ -245,4 +247,36 @@ this.nfsRetrans = nfsRetrans; } + @Override + public String toString() { + // Non-null, non-empty fields are logged in the order specified + Map<String, Object> entries = new LinkedHashMap<String, Object>(); + entries.put("id", getid()); + entries.put("storageType", getstorage_type()); + entries.put("connection", getconnection()); + entries.put("port", getport()); + entries.put("portal", getportal()); + entries.put("iqn", getiqn()); + entries.put("username", getuser_name()); + entries.put("mountOptions", getMountOptions()); + entries.put("vfsType", getVfsType()); + entries.put("nfsVersion", getNfsVersion()); + entries.put("nfsTimeo", getNfsTimeo()); + entries.put("nfsRetrans", getNfsRetrans()); + + StringBuilder sb = new StringBuilder(); + for (Map.Entry<String, Object> entry : entries.entrySet()) { + if (entry.getValue() != null && entry.getValue().toString().length() > 0) { + if (sb.length() > 0) { + sb.append(", "); + } + sb.append(entry.getKey()); + sb.append("="); + sb.append(entry.getValue().toString()); + } + } + sb.insert(0, "storage_server_connection("); + sb.append(")"); + return sb.toString(); + } } -- To view, visit http://gerrit.ovirt.org/7460 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I711f3bfb250ae6b9d5e80066a2a5647b55c382da Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
