diff --git a/saturn-core/src/main/java/com/vip/saturn/job/executor/SaturnExecutor.java b/saturn-core/src/main/java/com/vip/saturn/job/executor/SaturnExecutor.java index be2cab276..7d16a0825 100644 --- a/saturn-core/src/main/java/com/vip/saturn/job/executor/SaturnExecutor.java +++ b/saturn-core/src/main/java/com/vip/saturn/job/executor/SaturnExecutor.java @@ -492,12 +492,12 @@ private void shutdownUnfinishJobs() { public void run() { try { if (!regCenter.isConnected() || jobScheduler.getCurrentConf().isEnabled()) { - LogUtils.info(log, jobName, "job {} is enabled, start to force shutdown"); + LogUtils.info(log, jobName, "job is enabled, start to force shutdown"); jobScheduler.stopJob(true); } jobScheduler.shutdown(false); } catch (Throwable t) { - LogUtils.error(log, jobName, "job {} fail to shutdown", jobName, t); + LogUtils.error(log, jobName, "job fail to shutdown", t); } } })); @@ -640,7 +640,7 @@ protected boolean isAllowedToBeGracefulShutdown(JobConfiguration currentConf) { JobType jobType = JobType.valueOf(jobTypeValue); return ALLOWED_GRACEFUL_SHUTDOWN_TYPES.contains(jobType); } catch (Exception e) { - LogUtils.warn(log, currentConf.getJobName(), "no such job type:{}", jobTypeValue); + LogUtils.warn(log, currentConf.getJobName(), "no such job type:{}", jobTypeValue, e); return false; } }