|
@@ -23,9 +23,12 @@ public class TaskMagicDynamicRegistry extends AbstractMagicDynamicRegistry<TaskI
|
|
|
|
|
|
private static final Logger logger = LoggerFactory.getLogger(TaskMagicDynamicRegistry.class);
|
|
private static final Logger logger = LoggerFactory.getLogger(TaskMagicDynamicRegistry.class);
|
|
|
|
|
|
- public TaskMagicDynamicRegistry(MagicResourceStorage<TaskInfo> magicResourceStorage, TaskScheduler taskScheduler) {
|
|
|
|
|
|
+ private final boolean showLog;
|
|
|
|
+
|
|
|
|
+ public TaskMagicDynamicRegistry(MagicResourceStorage<TaskInfo> magicResourceStorage, TaskScheduler taskScheduler, boolean showLog) {
|
|
super(magicResourceStorage);
|
|
super(magicResourceStorage);
|
|
this.taskScheduler = taskScheduler;
|
|
this.taskScheduler = taskScheduler;
|
|
|
|
+ this.showLog = showLog;
|
|
}
|
|
}
|
|
|
|
|
|
@EventListener(condition = "#event.type == 'task'")
|
|
@EventListener(condition = "#event.type == 'task'")
|
|
@@ -54,14 +57,18 @@ public class TaskMagicDynamicRegistry extends AbstractMagicDynamicRegistry<TaskI
|
|
CronTask cronTask = new CronTask(() -> {
|
|
CronTask cronTask = new CronTask(() -> {
|
|
if (entity.isEnabled()) {
|
|
if (entity.isEnabled()) {
|
|
try {
|
|
try {
|
|
- logger.info("定时任务:[{}]开始执行", scriptName);
|
|
|
|
|
|
+ if (showLog) {
|
|
|
|
+ logger.info("定时任务:[{}]开始执行", scriptName);
|
|
|
|
+ }
|
|
MagicScriptContext magicScriptContext = new MagicScriptContext();
|
|
MagicScriptContext magicScriptContext = new MagicScriptContext();
|
|
magicScriptContext.setScriptName(scriptName);
|
|
magicScriptContext.setScriptName(scriptName);
|
|
ScriptManager.executeScript(entity.getScript(), magicScriptContext);
|
|
ScriptManager.executeScript(entity.getScript(), magicScriptContext);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
logger.error("定时任务执行出错", e);
|
|
logger.error("定时任务执行出错", e);
|
|
} finally {
|
|
} finally {
|
|
- logger.info("定时任务:[{}]执行完毕", scriptName);
|
|
|
|
|
|
+ if (showLog) {
|
|
|
|
+ logger.info("定时任务:[{}]执行完毕", scriptName);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}, trigger);
|
|
}, trigger);
|