Martin Peřina has uploaded a new change for review. Change subject: core: Replace oVirt logger with slf4j in bll/job ......................................................................
core: Replace oVirt logger with slf4j in bll/job Replaces oVirt logger with slf4j in bll/job package. Change-Id: I1546a4b1183442aa0a8784e722442e9ddd09d716 Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryCleanupManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java 3 files changed, 36 insertions(+), 31 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/34324/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionHandler.java index 41df5dd..473e0ca 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionHandler.java @@ -29,9 +29,9 @@ import org.ovirt.engine.core.dal.job.ExecutionMessageDirector; import org.ovirt.engine.core.utils.CorrelationIdTracker; import org.ovirt.engine.core.utils.lock.EngineLock; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.log.LoggedUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Provides methods for managing the flow objects the of the command, by the given execution context o the command. @@ -46,7 +46,7 @@ */ public class ExecutionHandler { - private static final Log log = LogFactory.getLog(ExecutionHandler.class); + private static final Logger log = LoggerFactory.getLogger(ExecutionHandler.class); private static final List<Class<?>> validationGroups = Arrays.asList(new Class<?>[] { PreRun.class }); @@ -134,7 +134,7 @@ } } } catch (Exception e) { - log.error(e); + log.error("Exception", e); } } } @@ -160,7 +160,8 @@ } } } catch (Exception e) { - log.errorFormat("Failed to terminate step {0} with status {1}", stepId, exitStatus, e); + log.error("Failed to terminate step '{}' with status '{}'", stepId, exitStatus); + log.error("Exception", e); } } @@ -204,10 +205,10 @@ context.setMonitored(true); } } catch (Exception e) { - log.errorFormat("Failed to prepare command of type {0} for monitoring due to error {1}", + log.error("Failed to prepare command of type '{}' for monitoring due to error '{}'", actionType.name(), - ExceptionUtils.getMessage(e), - e); + ExceptionUtils.getMessage(e)); + log.error("Exception", e); } } @@ -295,8 +296,9 @@ step.setExternal(isExternal); JobRepositoryFactory.getJobRepository().saveStep(step); } catch (Exception e) { - log.errorFormat("Failed to save new step {0} for job {1}, {2}.", stepName.name(), - job.getId(), job.getActionType().name(), e); + log.error("Failed to save new step '{}' for job '{}', '{}'.", stepName.name(), + job.getId(), job.getActionType().name()); + log.error("Exception", e); job.getSteps().remove(step); step = null; } @@ -308,7 +310,7 @@ } } } catch (Exception e) { - log.error(e); + log.error("Exception", e); } } return step; @@ -355,8 +357,9 @@ try { JobRepositoryFactory.getJobRepository().saveStep(step); } catch (Exception e) { - log.errorFormat("Failed to save new step {0} for step {1}, {2}.", stepName.name(), - parentStep.getId(), parentStep.getStepType().name(), e); + log.error("Failed to save new step '{}' for step '{}', '{}'.", stepName.name(), + parentStep.getId(), parentStep.getStepType().name()); + log.error("Exception", e); parentStep.getSteps().remove(step); step = null; } @@ -428,7 +431,7 @@ JobRepositoryFactory.getJobRepository().saveStep(step); } } catch (Exception e) { - log.error(e); + log.error("Exception", e); } return step; } @@ -476,7 +479,7 @@ } } } catch (Exception e) { - log.error(e); + log.error("Exception", e); } } @@ -485,7 +488,8 @@ try { JobRepositoryFactory.getJobRepository().updateCompletedJobAndSteps(job); } catch (Exception e) { - log.errorFormat("Failed to end Job {0}, {1}", job.getId(), job.getActionType().name(), e); + log.error("Failed to end Job '{}', '{}'", job.getId(), job.getActionType().name()); + log.error("Exception", e); } } @@ -611,7 +615,7 @@ context.setMonitored(true); } } catch (Exception e) { - log.error(e); + log.error("Exception", e); } return context; } @@ -664,7 +668,7 @@ } } } catch (Exception e) { - log.error(e); + log.error("Exception", e); } return step; } @@ -686,12 +690,12 @@ try { JobRepositoryFactory.getJobRepository().updateStep(step); } catch (Exception e) { - log.errorFormat("Failed to save step {0}, {1} for system-type {2} with id {3}", + log.error("Failed to save step '{}', '{}' for system-type '{}' with id '{}'", step.getId(), step.getStepType().name(), systemType.name(), - externalId, - e); + externalId); + log.error("Exception", e); } } @@ -788,7 +792,7 @@ } } } catch (RuntimeException e) { - log.error(e); + log.error("Exception", e); } } @@ -816,7 +820,7 @@ return DbFacade.getInstance().getJobDao().checkIfJobHasTasks(jobId); } } catch (RuntimeException e) { - log.error(e); + log.error("Exception", e); } return false; @@ -841,7 +845,7 @@ JobRepositoryFactory.getJobRepository().updateCompletedJobAndSteps(job); } } catch (RuntimeException e) { - log.error(e); + log.error("Exception", e); } } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryCleanupManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryCleanupManager.java index 6fbcdc9..bd43828 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryCleanupManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryCleanupManager.java @@ -6,10 +6,10 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.timer.OnTimerMethodAnnotation; import org.ovirt.engine.core.utils.timer.SchedulerUtilQuartzImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Responsible for clearing completed jobs from the database by running a fixed scheduled job @@ -17,7 +17,7 @@ */ public class JobRepositoryCleanupManager { - private static final Log log = LogFactory.getLog(JobRepositoryCleanupManager.class); + private static final Logger log = LoggerFactory.getLogger(JobRepositoryCleanupManager.class); private static JobRepositoryCleanupManager instance = new JobRepositoryCleanupManager(); private int succeededJobTime; private int failedJobTime; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java index 832f9a6..6e92bea 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java @@ -18,17 +18,17 @@ import org.ovirt.engine.core.dao.JobSubjectEntityDao; import org.ovirt.engine.core.dao.StepDao; import org.ovirt.engine.core.utils.collections.MultiValueMapUtils; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Implements the CRUD operations for the Job entities. */ public class JobRepositoryImpl implements JobRepository { - private static final Log log = LogFactory.getLog(JobRepositoryImpl.class); + private static final Logger log = LoggerFactory.getLogger(JobRepositoryImpl.class); private JobDao jobDao; private JobSubjectEntityDao jobSubjectEntityDao; @@ -53,7 +53,8 @@ jobDao.updateJobLastUpdateTime(step.getJobId(), new Date()); stepDao.save(step); } catch (Exception e) { - log.errorFormat("Failed to save step {0}, {1}.", step.getId(), step.getStepName(), e); + log.error("Failed to save step '{}', '{}'.", step.getId(), step.getStepName()); + log.error("Exception", e); } return null; } -- To view, visit http://gerrit.ovirt.org/34324 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1546a4b1183442aa0a8784e722442e9ddd09d716 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
