Skip to content

B
byit-myth-job
Commit f6049abd by huangfusuper
Options

规范日志输出

parent cd8cf883
Showing with 97 additions and 41 deletions
byit-myth-core/myth-admin-core/src/main/java/com/byit/factory/DaemonScanThreadRunHelperDbLock.java
package com.byit.factory;
import com.byit.thread.BaseThreadRunHelper;
import com.byit.util.MythLogUtils;
import com.byit.job.utils.MythLogUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component;
import javax.sql.DataSource;
......@@ -13,8 +12,6 @@ import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
/**
* 扫描线程运行帮助 使用数据库锁
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/factory/DaemonScanThreadRunHelperRedisLock.java
package com.byit.factory;
import com.byit.thread.BaseThreadRunHelper;
import com.byit.util.MythLogUtils;
import com.byit.job.utils.MythLogUtils;
import com.byit.util.lock.RedissLockUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/service/impl/EmailAlarmServiceImpl.java
......@@ -9,6 +9,7 @@ import com.byit.mapper.EmailAlarmMapper;
import com.byit.model.EmailAlarm;
import com.byit.model.vo.EmailAlarmVo;
import com.byit.service.EmailAlarmService;
import com.byit.job.utils.MythLogUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -86,7 +87,7 @@ public class EmailAlarmServiceImpl implements EmailAlarmService {
messageHelper.addAttachment(file.getName(),file);
} catch (MessagingException e) {
record.setAlarmResult("2");
log.error("-----------添加附件失败【{}】--------------",e.getMessage());
log.error("-----------添加附件失败【{}】--------------", MythLogUtils.getMessage(e));
}
});
}
......@@ -95,7 +96,7 @@ public class EmailAlarmServiceImpl implements EmailAlarmService {
record.setAlarmResult("1");
}catch (Exception e){
record.setAlarmResult("2");
log.error("-----------邮件发送失败【{}】--------------",e.getMessage());
log.error("-----------邮件发送失败【{}】--------------", MythLogUtils.getMessage(e));
throw new BusinessException(AdminEnums.SEND_EMAIL_FAILURE);
}
EmailAlarm emailAlarm = new EmailAlarm( );
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/task/JavaNodeExecutorTask.java
......@@ -14,7 +14,7 @@ import com.byit.service.FastRunLogService;
import com.byit.service.FlowStatusService;
import com.byit.service.impl.JobTaskRunLogServiceImpl;
import com.byit.service.impl.RunJavaServiceImpl;
import com.byit.util.MythLogUtils;
import com.byit.job.utils.MythLogUtils;
import com.byit.util.ServiceInfoUtil;
import com.byit.util.SpringUtil;
import io.netty.util.Timeout;
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/task/JavaTaskJobTask.java
package com.byit.task;
import com.alibaba.fastjson.JSON;
import com.byit.conf.MythJobAutoConfigure;
import com.byit.dto.plugin.JavaTask;
import com.byit.dto.plugin.RunLog;
import com.byit.enums.NodeRunStatusPropertyEnum;
import com.byit.enums.ScheduleTypeEnum;
import com.byit.enums.task.RunResultEnum;
import com.byit.job.utils.DateUtil;
......@@ -14,17 +11,14 @@ import com.byit.packet.response.PluginRpcResponsePacket;
import com.byit.param.CommunicationParam;
import com.byit.service.impl.JobTaskRunLogServiceImpl;
import com.byit.service.impl.RunJavaServiceImpl;
import com.byit.job.utils.MythLogUtils;
import com.byit.util.ServiceInfoUtil;
import com.byit.util.SpringUtil;
import io.netty.util.Timeout;
import io.netty.util.TimerTask;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import java.util.Date;
import static com.alibaba.fastjson.serializer.SerializerFeature.WriteClassName;
/**
* java节点的执行器
* @author huangfu
......@@ -77,8 +71,8 @@ public class JavaTaskJobTask implements TimerTask {
log.setTriggerCode(RunResultEnum.TRIGGER_ERROR.getCode());
log.setRunCode(RunResultEnum.RUN_ERROR.getCode());
log.setRunMsg(javaTask.getTaskName()+":"+e.getMessage());
log.setTriggerMsg(javaTask.getTaskName()+":"+e.getMessage());
log.setRunMsg(javaTask.getTaskName()+":"+ MythLogUtils.getMessage(e));
log.setTriggerMsg(javaTask.getTaskName()+":"+MythLogUtils.getMessage(e));
}
JobTaskRunLogServiceImpl jobTaskRunLogService = SpringUtil.getBean(JobTaskRunLogServiceImpl.class);
jobTaskRunLogService.updateJobTaskRunLogWithBLOBs(log);
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/task/ScriptExecutorJobTask.java
......@@ -10,19 +10,17 @@ import com.byit.enums.task.RunResultEnum;
import com.byit.enums.task.RunTypeEnum;
import com.byit.model.JobTaskRunLogWithBLOBs;
import com.byit.model.JobTaskSchedule;
import com.byit.model.RunRecording;
import com.byit.service.FastRunLogService;
import com.byit.service.FlowStatusService;
import com.byit.service.RunScriptService;
import com.byit.service.impl.JobTaskRunLogServiceImpl;
import com.byit.service.impl.RunRecordingServiceImpl;
import com.byit.job.utils.MythLogUtils;
import com.byit.util.ServiceInfoUtil;
import com.byit.util.SpringUtil;
import io.netty.util.Timeout;
import io.netty.util.TimerTask;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.validation.annotation.Validated;
import java.util.Date;
......@@ -105,14 +103,14 @@ public class ScriptExecutorJobTask implements TimerTask {
}catch (Exception e){
if (mythJobTaskSchedule.getScheduleType().equals(4)) {
StringRedisTemplate stringRedisTemplate = (StringRedisTemplate) SpringUtil.getBean("stringRedisTemplate");
RunLog runLog = RunLog.builder().isEnd(true).isSuccess(false).runLog("执行资源异常" + e.getMessage()).build();
RunLog runLog = RunLog.builder().isEnd(true).isSuccess(false).runLog("执行资源异常" + MythLogUtils.getMessage(e)).build();
//stringRedisTemplate.convertAndSend("REAL:EXEC:" + mythJobTaskSchedule.getLogId() , JSON.toJSONString(runLog, WriteClassName));
//使用redis 想队尾push一个值
stringRedisTemplate.opsForList().rightPush("REAL:EXEC:" + mythJobTaskSchedule.getLogId() , JSON.toJSONString(runLog, WriteClassName));
}
log.error("------执行机异常{}-----", e.getMessage());
dispatchResponseDto.setMsg(e.getMessage());
log.error("------执行机异常{}-----", MythLogUtils.getMessage(e));
dispatchResponseDto.setMsg(MythLogUtils.getMessage(e));
dispatchResponseDto.setCode(JobResultEnum.DISPATCH_FAIL.getCode());
}
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/helper/JobTaskThreadRunHelper.java
......@@ -6,7 +6,6 @@ import com.byit.enums.NodeNameEnum;
import com.byit.enums.ScheduleTypeEnum;
import com.byit.exceptions.SuperiorNodeRunException;
import com.byit.flowservice.NodeVerification;
import com.byit.job.exceptions.BusinessException;
import com.byit.model.JobTask;
import com.byit.model.JobTaskSchedule;
import com.byit.model.RunRecording;
......@@ -16,6 +15,7 @@ import com.byit.service.mapservice.RunRecordingAndJobTaskService;
import com.byit.service.mapservice.TaskAndLogServer;
import com.byit.service.mapservice.TaskAndScheduleService;
import com.byit.thread.BaseThreadRunHelper;
import com.byit.job.utils.MythLogUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
......@@ -113,7 +113,7 @@ public class JobTaskThreadRunHelper extends BaseThreadRunHelper {
e.printStackTrace();
}
} catch (Exception e) {
log.error("-----------------节点执行时出现异常,{}----------",e.getMessage());
log.error("-----------------节点执行时出现异常,{}----------", MythLogUtils.getMessage(e));
try {
taskAndLogServer.addRunLogAndRemoveTask(jobTask,true,true);
} catch (UnknownHostException unknownHostException) {
......@@ -141,13 +141,13 @@ public class JobTaskThreadRunHelper extends BaseThreadRunHelper {
try {
taskAndLogServer.addRunLogAndRemoveTask(jobTask,false,false);
} catch (UnknownHostException e) {
log.error("-----------------节点执行时出现异常,{}----------",e.getMessage());
log.error("-----------------节点执行时出现异常,{}----------",MythLogUtils.getMessage(e));
}
}catch (Exception businessException) {
try {
taskAndLogServer.addRunLogAndRemoveTask(jobTask,false,true);
} catch (UnknownHostException e) {
log.error("-----------------节点执行时出现异常,{}----------",e.getMessage());
log.error("-----------------节点执行时出现异常,{}----------",MythLogUtils.getMessage(e));
}
}
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/util/lock/RedissonDistributedLocker.java
package com.byit.util.lock;
import com.byit.job.utils.MythLogUtils;
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
......@@ -33,7 +34,7 @@ public class RedissonDistributedLocker implements DistributedLocker {
try {
lockFlag = lock.tryLock(leaseTime, TimeUnit.SECONDS);
} catch (InterruptedException e) {
log.error("-----------------{}------------",e.getMessage());
log.error("-----------------{}------------", MythLogUtils.getMessage(e));
Thread.currentThread().interrupt();
}
return lockFlag;
......@@ -46,7 +47,7 @@ public class RedissonDistributedLocker implements DistributedLocker {
try {
lockFlag = lock.tryLock(timeout, unit);
} catch (InterruptedException e) {
log.error("-----------------{}------------",e.getMessage());
log.error("-----------------{}------------",MythLogUtils.getMessage(e));
Thread.currentThread().interrupt();
}
return lockFlag;
......
byit-myth-core/myth-core-common/src/main/java/com/byit/job/utils/JwtHelper.java
......@@ -53,7 +53,7 @@ public class JwtHelper {
//token 为空
throw new BusinessException("缺少token参数");
} catch (Exception e) {
log.error(" message:{}", e.getMessage());
log.error(" message:{}", e);
throw new BusinessException("解析token失败");
}
}
......
byit-myth-core/myth-web-core/src/main/java/com/byit/web/advice/ExceptionHandle.java
......@@ -5,6 +5,7 @@ import com.byit.enums.IEnum;
import com.byit.enums.TransferResultEnum;
import com.byit.exception.DataValidationException;
import com.byit.job.exceptions.IException;
import com.byit.job.utils.MythLogUtils;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
......@@ -27,9 +28,9 @@ public class ExceptionHandle {
if(e instanceof IException){
return error(e);
}else if(e instanceof DataValidationException){
return ResponseResult.error(TransferResultEnum.ERROR.getCode(),e.getMessage());
return ResponseResult.error(TransferResultEnum.ERROR.getCode(), MythLogUtils.getMessage(e));
}
return ResponseResult.error(e.getMessage());
return ResponseResult.error(MythLogUtils.getMessage(e));
}
/**
......
byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/thread/RunJobThread.java
......@@ -7,6 +7,7 @@ import com.byit.dto.web.ReturnResult;
import com.byit.enums.JobResultEnum;
import com.byit.executor.handler.interfaces.IJobHandler;
import com.byit.utils.JobUtils;
import com.byit.utils.PluginLogUtils;
import lombok.extern.slf4j.Slf4j;
import java.util.Date;
......@@ -53,7 +54,7 @@ public class RunJobThread implements Runnable {
} catch (Exception e) {
e.printStackTrace( );
ReturnResult<String> returnResult = new ReturnResult<>();
returnResult.setMsg(e.getMessage());
returnResult.setMsg(PluginLogUtils.getMessage(e));
returnResult.setCode(JobResultEnum.FAIL.getCode());
return returnResult;
}
......
byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/utils/PluginLogUtils.java 0 → 100644
package com.byit.utils;
import java.io.PrintWriter;
import java.io.StringWriter;
/**
* @author huangfu
*/
public class PluginLogUtils {
/**
* 读取异常信息
* @param obj 异常对象
* @return 返回堆栈异常信息
*/
public static String getMessage(Object obj) {
if (obj == null) {
return "";
}
if (obj instanceof Throwable) {
StringWriter str = new StringWriter();
PrintWriter pw = new PrintWriter(str);
((Throwable) obj).printStackTrace(pw);
return str.toString();
} else {
return obj.toString();
}
}
}
\ No newline at end of file
byit-myth-executor/myth-executor-server/src/main/java/com/byit/process/MythJobProcess.java
......@@ -2,6 +2,7 @@ package com.byit.process;
import com.alibaba.fastjson.JSON;
import com.byit.dto.plugin.RunLog;
import com.byit.utils.ExecutorLogUtil;
import com.byit.utils.JobContentUtil;
import com.byit.utils.LogGobbler;
import com.google.common.base.Joiner;
......@@ -230,7 +231,7 @@ public class MythJobProcess implements Callable<String>{
}
return this.completeLatch.await(time, unit);
} catch (final IOException e) {
log.error("尝试杀死失败.{}", e.getMessage());
log.error("尝试杀死失败.{}", ExecutorLogUtil.getMessage(e));
}
}
//如果是杀死将退出值改为-100
......@@ -262,7 +263,7 @@ public class MythJobProcess implements Callable<String>{
Runtime.getRuntime().exec(cmd);
}
} catch (final IOException e) {
log.error("Kill attempt failed.:{}", e.getMessage());
log.error("Kill attempt failed.:{}", ExecutorLogUtil.getMessage(e));
}
}
this.process.destroy();
......@@ -287,7 +288,7 @@ public class MythJobProcess implements Callable<String>{
processId = f.getInt(process);
} catch (final Throwable e) {
log.error("获取进程id出错.{}", e.getMessage());
log.error("获取进程id出错.{}", ExecutorLogUtil.getMessage(e));
}
return processId;
}
......
byit-myth-executor/myth-executor-server/src/main/java/com/byit/service/ImperativeExecutionImpl.java
......@@ -14,6 +14,7 @@ import com.byit.node.impl.ParameterVerificationProcessingMachine;
import com.byit.node.impl.RunScriptProcessingMachine;
import com.byit.pool.RunThreadPool;
import com.byit.rpc.remoting.provider.annotation.RpcService;
import com.byit.utils.ExecutorLogUtil;
import com.byit.utils.ServiceInfoUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
......@@ -94,10 +95,10 @@ public class ImperativeExecutionImpl implements ScriptExecutorService {
jobRunResultDto.setReturnResult(ReturnResult.FAIL);
}
}catch (Exception e) {
log.error("调度执行机出现异常：{}",e.getMessage());
log.error("调度执行机出现异常：{}", ExecutorLogUtil.getMessage(e));
ReturnResult<String> returnResult = new ReturnResult<>();
returnResult.setCode(ReturnResult.FAIL.getCode());
returnResult.setMsg(e.getMessage());
returnResult.setMsg(ExecutorLogUtil.getMessage(e));
jobRunResultDto.setReturnResult(returnResult);
}
//设置结束时间
......
byit-myth-executor/myth-executor-server/src/main/java/com/byit/service/ScriptExecutorServiceImpl.java
......@@ -15,6 +15,7 @@ import com.byit.job.utils.PlaceholderUtils;
import com.byit.dto.web.ReturnResult;
import com.byit.pool.RunThreadPool;
import com.byit.rpc.remoting.provider.annotation.RpcService;
import com.byit.utils.ExecutorLogUtil;
import com.byit.utils.ServiceInfoUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
......@@ -163,10 +164,10 @@ public class ScriptExecutorServiceImpl implements ScriptExecutorService {
jobRunResultDto.setReturnResult(ReturnResult.FAIL);
}
} catch (Exception e){
log.error("调度执行机出现异常：{}",e.getMessage());
log.error("调度执行机出现异常：{}", ExecutorLogUtil.getMessage(e));
ReturnResult<String> returnResult = new ReturnResult<>();
returnResult.setCode(ReturnResult.FAIL.getCode());
returnResult.setMsg(e.getMessage());
returnResult.setMsg(ExecutorLogUtil.getMessage(e));
jobRunResultDto.setReturnResult(returnResult);
}
......
byit-myth-executor/myth-executor-server/src/main/java/com/byit/utils/ExecutorLogUtil.java 0 → 100644
package com.byit.utils;
import java.io.PrintWriter;
import java.io.StringWriter;
/**
* @author huangfu
*/
public class ExecutorLogUtil {
/**
* 读取异常信息
* @param obj 异常对象
* @return 返回堆栈异常信息
*/
public static String getMessage(Object obj) {
if (obj == null) {
return "";
}
if (obj instanceof Throwable) {
StringWriter str = new StringWriter();
PrintWriter pw = new PrintWriter(str);
((Throwable) obj).printStackTrace(pw);
return str.toString();
} else {
return obj.toString();
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment