执行日志逻辑调整
This commit is contained in:
parent
466b4e868a
commit
beb71a4939
|
@ -178,7 +178,6 @@ import com.xxl.job.core.biz.model.ReturnT;
|
|||
import com.xxl.job.core.handler.IJobHandler;
|
||||
|
||||
public class DemoGlueJobHandler extends IJobHandler {
|
||||
private static transient Logger logger = LoggerFactory.getLogger(DemoGlueJobHandler.class);
|
||||
|
||||
@Override
|
||||
public ReturnT<String> execute(String... params) throws Exception {
|
||||
|
|
|
@ -22,7 +22,7 @@ public class GlueJobHandler extends IJobHandler {
|
|||
|
||||
@Override
|
||||
public ReturnT<String> execute(String... params) throws Exception {
|
||||
XxlJobLogger.log("----------- glue.version:{} -----------" + glueUpdatetime);
|
||||
XxlJobLogger.log("----------- glue.version:"+ glueUpdatetime +" -----------");
|
||||
return jobHandler.execute(params);
|
||||
}
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@ import com.xxl.job.core.executor.XxlJobExecutor;
|
|||
import com.xxl.job.core.glue.GlueTypeEnum;
|
||||
import com.xxl.job.core.handler.IJobHandler;
|
||||
import com.xxl.job.core.log.XxlJobFileAppender;
|
||||
import com.xxl.job.core.log.XxlJobLogger;
|
||||
import com.xxl.job.core.util.ScriptUtil;
|
||||
|
||||
/**
|
||||
|
@ -49,6 +50,7 @@ public class ScriptJobHandler extends IJobHandler {
|
|||
String logFileName = XxlJobExecutor.logPath.concat(XxlJobFileAppender.contextHolder.get());
|
||||
|
||||
// invoke
|
||||
XxlJobLogger.log("----------- script file:"+ scriptFileName +" -----------");
|
||||
int exitValue = ScriptUtil.execToFile(cmd, scriptFileName, logFileName, params);
|
||||
ReturnT<String> result = (exitValue==0)?ReturnT.SUCCESS:new ReturnT<String>(ReturnT.FAIL_CODE, "script exit value("+exitValue+") is failed");
|
||||
return result;
|
||||
|
|
|
@ -91,11 +91,13 @@ public class JobThread extends Thread{
|
|||
if (toStop) {
|
||||
XxlJobLogger.log("<br>----------- xxl-job toStop, stopReason:" + stopReason);
|
||||
}
|
||||
logger.error("JobThread Exception:", e);
|
||||
StringWriter out = new StringWriter();
|
||||
e.printStackTrace(new PrintWriter(out));
|
||||
|
||||
executeResult = new ReturnT<String>(ReturnT.FAIL_CODE, out.toString());
|
||||
StringWriter stringWriter = new StringWriter();
|
||||
e.printStackTrace(new PrintWriter(stringWriter));
|
||||
String errorMsg = stringWriter.toString();
|
||||
XxlJobLogger.log("JobThread Exception:" + errorMsg);
|
||||
|
||||
executeResult = new ReturnT<String>(ReturnT.FAIL_CODE, stringWriter.toString());
|
||||
}
|
||||
|
||||
XxlJobLogger.log("----------- xxl-job job execute end ----------- <br> " +
|
||||
|
@ -117,10 +119,7 @@ public class JobThread extends Thread{
|
|||
}
|
||||
|
||||
StringWriter stringWriter = new StringWriter();
|
||||
PrintWriter printWriter = new PrintWriter(stringWriter, true);
|
||||
e.printStackTrace(printWriter);
|
||||
printWriter.flush();
|
||||
stringWriter.flush();
|
||||
e.printStackTrace(new PrintWriter(stringWriter));
|
||||
String errorMsg = stringWriter.toString();
|
||||
XxlJobLogger.log("----------- xxl-job JobThread Exception:" + errorMsg);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue