Alexander Wels has uploaded a new change for review. Change subject: core: provided cleared frontend logging ......................................................................
core: provided cleared frontend logging - Added code to display better debug messages for -- RunQuery -- RunPublicQuery -- RunMultipleQueries -- RunAction -- RunMultipleActions Change-Id: I845aa47da03168f1a0f988203df7ab0a51e94804 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=903312 Signed-off-by: Alexander Wels <aw...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/SearchParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java 5 files changed, 76 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/12559/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java index 0d87ced..0754dc2 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionParametersBase.java @@ -295,4 +295,15 @@ ROLLBACK_FLOW; } + @Override + public String toString() { + StringBuilder builder = new StringBuilder(50); + builder.append("commandId: "); //$NON-NLS-1$ + builder.append(getCommandId()); + builder.append(", user: "); //$NON-NLS-1$ + builder.append(getParametersCurrentUser().getUserName()); + builder.append(", commandType: "); //$NON-NLS-1$ + builder.append(getCommandType()); + return builder.toString(); + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java index 03d5db7..83639fb 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConfigurationValueParameters.java @@ -31,4 +31,16 @@ public GetConfigurationValueParameters() { } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(50); + builder.append("version: "); //$NON-NLS-1$ + builder.append(getVersion()); + builder.append(", configuration value: "); + builder.append(getConfigValue()); + builder.append(", "); + builder.append(super.toString()); + return builder.toString(); + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/SearchParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/SearchParameters.java index c6b914c..d064dcf 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/SearchParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/SearchParameters.java @@ -58,4 +58,21 @@ caseSensitive = value; } + @Override + public String toString() { + StringBuilder builder = new StringBuilder(50); + builder.append("search type: "); + builder.append(getSearchTypeValue()); + builder.append(", search pattern: ["); + builder.append(getSearchPattern()); + builder.append("], case sensitive? "); + builder.append(getCaseSensitive()); + builder.append(" [from: "); + builder.append(getSearchFrom()); + builder.append(", max: "); + builder.append(getMaxCount()); + builder.append("] "); + builder.append(super.toString()); + return builder.toString(); + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java index 7b1b2d1..c4fa600 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryParametersBase.java @@ -59,4 +59,14 @@ public void setFiltered(boolean isFiltered) { this.isFiltered = isFiltered; } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(25); + builder.append("Is refresh? "); + builder.append(refresh); + builder.append(", Is filtered? "); + builder.append(isFiltered); + return builder.toString(); + } } diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java index 62c58e1..bed542e 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GenericApiGWTServiceImpl.java @@ -51,6 +51,7 @@ public VdcQueryReturnValue RunQuery(VdcQueryType search, VdcQueryParametersBase searchParameters) { log.debug("Server: RunQuery invoked!"); //$NON-NLS-1$ + debugQuery(search, searchParameters); searchParameters.setSessionId(getSessionId()); return getBackend().RunQuery(search, searchParameters); } @@ -58,7 +59,8 @@ @Override public VdcQueryReturnValue RunPublicQuery(VdcQueryType queryType, VdcQueryParametersBase params) { - log.debug("Server: RunPublicQuery invoked!"); //$NON-NLS-1$ + log.debug("Server: RunPublicQuery invoked! " + queryType); //$NON-NLS-1$ + debugQuery(queryType, params); return getBackend().RunPublicQuery(queryType, params); } @@ -67,7 +69,6 @@ ArrayList<VdcQueryType> queryTypeList, ArrayList<VdcQueryParametersBase> queryParamsList) { log.debug("Server: RunMultipleQuery invoked! [amount of queries: " + queryTypeList.size() + "]"); //$NON-NLS-1$ //$NON-NLS-2$ - ArrayList<VdcQueryReturnValue> ret = new ArrayList<VdcQueryReturnValue>(); if (queryTypeList == null || queryParamsList == null) { @@ -81,6 +82,7 @@ else { for (int i = 0; i < queryTypeList.size(); i++) { + debugQuery(queryTypeList.get(i), queryParamsList.get(i)); ret.add(RunQuery(queryTypeList.get(i), queryParamsList.get(i))); } } @@ -113,7 +115,7 @@ public VdcReturnValueBase RunAction(VdcActionType actionType, VdcActionParametersBase params) { log.debug("Server: RunAction invoked!"); //$NON-NLS-1$ - + debugAction(actionType, params); params.setSessionId(getSessionId()); if (noBackend) { @@ -172,4 +174,25 @@ return session.getId(); } + private void debugQuery(VdcQueryType queryType, VdcQueryParametersBase parameters) { + if(log.isDebugEnabled()) { + StringBuilder builder = new StringBuilder(50); + builder.append("Query type: ");//$NON-NLS-1$ + builder.append(queryType); + builder.append(", Parameters: ");//$NON-NLS-1$ + builder.append(parameters); + log.debug(builder.toString()); + } + } + + private void debugAction(VdcActionType actionType, VdcActionParametersBase params) { + if(log.isDebugEnabled()) { + StringBuilder builder = new StringBuilder(50); + builder.append("Action type: "); //$NON-NLS-1$ + builder.append(actionType); + builder.append(", Parameters: "); //$NON-NLS-1$ + builder.append(params); + } + } + } -- To view, visit http://gerrit.ovirt.org/12559 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I845aa47da03168f1a0f988203df7ab0a51e94804 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <aw...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
