|
@@ -1,18 +1,18 @@
|
|
package com.xxl.job.admin.core.trigger;
|
|
package com.xxl.job.admin.core.trigger;
|
|
|
|
|
|
import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
|
|
import com.xxl.job.admin.core.conf.XxlJobAdminConfig;
|
|
-import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
|
|
|
|
import com.xxl.job.admin.core.model.XxlJobGroup;
|
|
import com.xxl.job.admin.core.model.XxlJobGroup;
|
|
import com.xxl.job.admin.core.model.XxlJobInfo;
|
|
import com.xxl.job.admin.core.model.XxlJobInfo;
|
|
import com.xxl.job.admin.core.model.XxlJobLog;
|
|
import com.xxl.job.admin.core.model.XxlJobLog;
|
|
import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
|
|
import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
|
|
|
|
+import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
|
|
import com.xxl.job.admin.core.util.I18nUtil;
|
|
import com.xxl.job.admin.core.util.I18nUtil;
|
|
import com.xxl.job.core.biz.ExecutorBiz;
|
|
import com.xxl.job.core.biz.ExecutorBiz;
|
|
import com.xxl.job.core.biz.model.ReturnT;
|
|
import com.xxl.job.core.biz.model.ReturnT;
|
|
import com.xxl.job.core.biz.model.TriggerParam;
|
|
import com.xxl.job.core.biz.model.TriggerParam;
|
|
import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
|
|
import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
|
|
import com.xxl.job.core.util.IpUtil;
|
|
import com.xxl.job.core.util.IpUtil;
|
|
-import io.netty.util.internal.ThrowableUtil;
|
|
|
|
|
|
+import com.xxl.job.core.util.ThrowableUtil;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
|
@@ -211,7 +211,7 @@ public class XxlJobTrigger {
|
|
runResult = executorBiz.run(triggerParam);
|
|
runResult = executorBiz.run(triggerParam);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
logger.error(">>>>>>>>>>> xxl-job trigger error, please check if the executor[{}] is running.", address, e);
|
|
logger.error(">>>>>>>>>>> xxl-job trigger error, please check if the executor[{}] is running.", address, e);
|
|
- runResult = new ReturnT<String>(ReturnT.FAIL_CODE, ThrowableUtil.stackTraceToString(e));
|
|
|
|
|
|
+ runResult = new ReturnT<String>(ReturnT.FAIL_CODE, ThrowableUtil.toString(e));
|
|
}
|
|
}
|
|
|
|
|
|
StringBuffer runResultSB = new StringBuffer(I18nUtil.getString("jobconf_trigger_run") + ":");
|
|
StringBuffer runResultSB = new StringBuffer(I18nUtil.getString("jobconf_trigger_run") + ":");
|