Alissa Bonas has uploaded a new change for review. Change subject: core: fix logging and mispelling in few classes ......................................................................
core: fix logging and mispelling in few classes 1.Fix mispelling of comment 2.Rephrase logging message 3.Log exception in error instead of debug 4.Getting the correct logger of same class in PasswordValueHelper 5.Not log same exception twice as error and debug, instead have one unified logging in error for both message and corresponding exception Change-Id: I1da28578bec13daa58e19081d78f6dbb07f264ca Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java M backend/manager/tools/engine-config/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java 7 files changed, 12 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/10951/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java index ffb4fe6..f4eb449 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java @@ -183,9 +183,7 @@ ctx.setMonitored(true); ctx.setShouldEndJob(true); } catch (RuntimeException e) { - log.errorFormat("Error when creating executing context for running stateless VM. Error is: {0} ", - e.getMessage()); - log.debug("", e); + log.error("Error when creating executing context for running stateless VM", e); } return ctx; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java index 2adc0bd..796627b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java @@ -413,7 +413,7 @@ } catch (RuntimeException ex) { log.infoFormat("Could not stop migrating vm: {0} on vds: {1}, Error: {2}", vm.getVmName(), vm.getmigrating_to_vds(), ex.getMessage()); - // intentionally ingnored + // intentionally ignored } } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java index 1ec9b9f..96d41ea 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java @@ -109,10 +109,7 @@ pool.getname()); } catch (Exception ex) { addAuditLogError(pool.getname()); - log.errorFormat("Exception while trying to update or remove VMs/Templates ovf in Data Center {0}, the exception is {1}", - pool.getname(), - ex.getMessage()); - log.debug(ex.getStackTrace()); + log.errorFormat("Exception while trying to update or remove VMs/Templates ovf in Data Center {0}.", pool.getname(), ex); } } proccessedIdsInfo = null; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java index 404f8c4..bcd6acc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java @@ -266,7 +266,7 @@ } catch (RuntimeException e) { // Set the try again of task to false, to prevent log spam and audit log spam. getReturnValue().setEndActionTryAgain(false); - log.errorFormat("Encounter a problem removing template from DB, Setting the action, not to try again."); + log.error("Encountered a problem removing template from DB, setting the action not to retry."); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java index 4192fdd..57697ca 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java @@ -29,7 +29,7 @@ /** * Saves async task in DB - * @param dbAsyncTask + * @param asyncTask * async task entity to be saved in DB */ public static void saveAsyncTaskInDB(SPMAsyncTask asyncTask) { @@ -39,7 +39,7 @@ /** * Updates existing task in DB - * @param dbAsyncTask async task entity to be updated in DB + * @param asyncTask async task entity to be updated in DB */ public static void updateAsyncTaskInDB(SPMAsyncTask asyncTask) { DbFacade.getInstance().getAsyncTaskDao().update(asyncTask.getParameters().getDbAsyncTask()); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java index d1346d8..a62704e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java @@ -334,10 +334,10 @@ } } catch (Exception e) { if (e.getCause() != null) { - log.debug("CreateCommand failed", e.getCause()); + log.error("CreateCommand failed", e.getCause()); throw new RuntimeException(e.getCause().getMessage(), e.getCause()); } - log.debug("CreateCommand failed", e); + log.error("CreateCommand failed", e); } return null; } @@ -356,10 +356,10 @@ } } catch (Exception e) { if (e.getCause() != null) { - log.debug("CreateCommand failed", e.getCause()); + log.error("CreateCommand failed", e.getCause()); throw new RuntimeException(e.getCause().getMessage(), e.getCause()); } - log.debug("CreateCommand failed", e); + log.error("CreateCommand failed", e); } return null; diff --git a/backend/manager/tools/engine-config/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java b/backend/manager/tools/engine-config/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java index 4d9b810..2a66a20 100644 --- a/backend/manager/tools/engine-config/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java +++ b/backend/manager/tools/engine-config/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java @@ -21,7 +21,6 @@ private static String keyStorePass; private static final Logger log = Logger.getLogger(PasswordValueHelper.class); public static final String INTERACTIVE_MODE = "Interactive"; - public static final String ADMIN_PASS_FILE = "admin-pass-file"; private EngineConfigCLIParser parser; static { @@ -67,7 +66,7 @@ returnedValue = "Set"; } catch (Exception e) { String msg = "Failed to decrypt the current value"; - Logger.getLogger(EngineConfig.class).debug(msg, e); + log.error(msg, e); throw new GeneralSecurityException(msg); } } @@ -94,7 +93,7 @@ returnedValue = encrypt(password); } catch (Throwable e) { String msg = "Failed to encrypt the current value"; - Logger.getLogger(EngineConfig.class).debug(msg, e); + log.error(msg, e); throw new GeneralSecurityException(msg); } -- To view, visit http://gerrit.ovirt.org/10951 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1da28578bec13daa58e19081d78f6dbb07f264ca Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
