diff options
Diffstat (limited to 'vid-app-common/src/main/java/org/onap/vid/job/impl')
3 files changed, 18 insertions, 13 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/job/impl/DeleteOldJobsSchedulerInitializer.java b/vid-app-common/src/main/java/org/onap/vid/job/impl/DeleteOldJobsSchedulerInitializer.java index 114c20105..981bdeaa7 100644 --- a/vid-app-common/src/main/java/org/onap/vid/job/impl/DeleteOldJobsSchedulerInitializer.java +++ b/vid-app-common/src/main/java/org/onap/vid/job/impl/DeleteOldJobsSchedulerInitializer.java @@ -64,7 +64,7 @@ public class DeleteOldJobsSchedulerInitializer { Trigger deleteOldJobsTrigger = createTrigger(); schedulerFactoryBean.getScheduler().scheduleJob(jobDetail, deleteOldJobsTrigger); } catch (SchedulerException e) { - logger.error(EELFLoggerDelegate.errorLogger, "Failed to schedule trigger for delete old jobs: {}", e.getMessage()); + logger.error("Failed to schedule trigger for delete old jobs: {}", e.getMessage()); throw new GenericUncheckedException(e); } } diff --git a/vid-app-common/src/main/java/org/onap/vid/job/impl/JobSchedulerInitializer.java b/vid-app-common/src/main/java/org/onap/vid/job/impl/JobSchedulerInitializer.java index b5c2dd74b..bd82ffa7a 100644 --- a/vid-app-common/src/main/java/org/onap/vid/job/impl/JobSchedulerInitializer.java +++ b/vid-app-common/src/main/java/org/onap/vid/job/impl/JobSchedulerInitializer.java @@ -20,24 +20,29 @@ package org.onap.vid.job.impl; +import static org.quartz.SimpleScheduleBuilder.simpleSchedule; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import java.util.List; +import javax.annotation.PostConstruct; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.vid.exceptions.GenericUncheckedException; import org.onap.vid.job.Job; import org.onap.vid.job.JobsBrokerService; import org.onap.vid.job.command.JobCommandFactory; -import org.quartz.*; +import org.quartz.JobBuilder; +import org.quartz.JobDataMap; +import org.quartz.JobDetail; +import org.quartz.Scheduler; +import org.quartz.SchedulerException; +import org.quartz.Trigger; +import org.quartz.TriggerBuilder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.quartz.SchedulerFactoryBean; import org.springframework.stereotype.Component; import org.togglz.core.manager.FeatureManager; -import javax.annotation.PostConstruct; -import java.util.List; - -import static org.quartz.SimpleScheduleBuilder.simpleSchedule; - @Component public class JobSchedulerInitializer { @@ -94,7 +99,7 @@ public class JobSchedulerInitializer { try { scheduler.scheduleJob(jobDetail, asyncWorkerTrigger); } catch (SchedulerException e) { - logger.error(EELFLoggerDelegate.errorLogger, "Failed to schedule trigger for async worker jobs: {}", e.getMessage()); + logger.error("Failed to schedule trigger for async worker jobs: {}", e.getMessage()); throw new GenericUncheckedException(e); } } diff --git a/vid-app-common/src/main/java/org/onap/vid/job/impl/JobWorker.java b/vid-app-common/src/main/java/org/onap/vid/job/impl/JobWorker.java index c629a665c..c0e006e22 100644 --- a/vid-app-common/src/main/java/org/onap/vid/job/impl/JobWorker.java +++ b/vid-app-common/src/main/java/org/onap/vid/job/impl/JobWorker.java @@ -69,7 +69,7 @@ public class JobWorker extends QuartzJobBean { try { return jobsBrokerService.pull(topic, UUID.randomUUID().toString()); } catch (Exception e) { - LOGGER.error(EELFLoggerDelegate.errorLogger, "failed to pull job from queue, breaking: {}", e, e); + LOGGER.error("failed to pull job from queue, breaking: {}", e, e); tryMutingJobFromException(e); return Optional.empty(); @@ -80,7 +80,7 @@ public class JobWorker extends QuartzJobBean { try { jobsBrokerService.pushBack(nextJob); } catch (Exception e) { - LOGGER.error(EELFLoggerDelegate.errorLogger, "failed pushing back job to queue: {}", e, e); + LOGGER.error("failed pushing back job to queue: {}", e, e); } } @@ -114,7 +114,7 @@ public class JobWorker extends QuartzJobBean { final JobCommand jobCommand = jobCommandFactory.toCommand(job); nextCommand = jobCommand.call(); } catch (Exception e) { - LOGGER.error(EELFLoggerDelegate.errorLogger, "error while executing job from queue: {}", e); + LOGGER.error("error while executing job from queue: {}", e, e); nextCommand = new NextCommand(FAILED); } @@ -153,10 +153,10 @@ public class JobWorker extends QuartzJobBean { LOGGER.info(EELFLoggerDelegate.debugLogger, "muting job: {} ({})", jobException.getJobUuid(), jobException.toString()); final boolean success = jobsBrokerService.mute(jobException.getJobUuid()); if (!success) { - LOGGER.error(EELFLoggerDelegate.errorLogger, "failed to mute job {}", jobException.getJobUuid()); + LOGGER.error("failed to mute job {}", jobException.getJobUuid()); } } catch (Exception e1) { - LOGGER.error(EELFLoggerDelegate.errorLogger, "failed to mute job: {}", e1, e1); + LOGGER.error("failed to mute job: {}", e1, e1); } } } |