linjj
/
docus-collector2.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

被动任务和主动任务重试创建时间不对

Browse Source
segment2.0
linrf 2 years ago
parent 705cda8501
commit 1fe0c673b7
8 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/ChannelRepository.java
Unescape Escape View File

@ -9,7 +9,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
* Created by 1-point at 2021/9/8
* 客户端IP和通信信道的映射
*/
@Component
@Slf4j

26
collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServer.java
Unescape Escape View File

@ -15,7 +15,7 @@ import javax.annotation.Resource;
import java.net.InetSocketAddress;
/**
* Created by 1-point at 2021/9/7
* netty服务端初始化
*/
@Component
@Slf4j
@ -38,21 +38,21 @@ public class NettyServer {
@PostConstruct
public void start() throws InterruptedException {
boss= new NioEventLoopGroup(serverProperties.getBossThreadCount());
boss = new NioEventLoopGroup(serverProperties.getBossThreadCount());
worker = new NioEventLoopGroup(serverProperties.getWorkerThreadCount());
ServerBootstrap bootstrap = new ServerBootstrap();
bootstrap.group(boss, worker)
// 指定Channel
.channel(NioServerSocketChannel.class)
//使用指定的端口设置套接字地址
.localAddress(new InetSocketAddress(serverProperties.getPort()))
//服务端可连接队列数,对应TCP/IP协议listen函数中backlog参数
.option(ChannelOption.SO_BACKLOG, 1024)
//设置TCP长连接,一般如果两个小时内没有数据的通信时,TCP会自动发送一个活动探测数据报文
.childOption(ChannelOption.SO_KEEPALIVE, true)
//将小的数据包包装成更大的帧进行传送，提高网络的负载
.childOption(ChannelOption.TCP_NODELAY, true)
.childHandler(serverInitializer);
// 指定Channel
.channel(NioServerSocketChannel.class)
//使用指定的端口设置套接字地址
.localAddress(new InetSocketAddress(serverProperties.getPort()))
//服务端可连接队列数,对应TCP/IP协议listen函数中backlog参数
.option(ChannelOption.SO_BACKLOG, 1024)
//设置TCP长连接,一般如果两个小时内没有数据的通信时,TCP会自动发送一个活动探测数据报文
.childOption(ChannelOption.SO_KEEPALIVE, true)
//将小的数据包包装成更大的帧进行传送，提高网络的负载
.childOption(ChannelOption.TCP_NODELAY, true)
.childHandler(serverInitializer);
ChannelFuture future = bootstrap.bind().sync();
if (future.isSuccess()) {
log.info("Start netty server successfully");

2
collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServerInitializer.java
Unescape Escape View File

@ -16,7 +16,7 @@ import javax.annotation.Resource;
import java.util.concurrent.TimeUnit;
/**
* Created by 1-point at 2021/9/7
* netty服务端信道初始化
*/
@Component
public class NettyServerInitializer extends ChannelInitializer<Channel> {

2
collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/NettyServerProperties.java
Unescape Escape View File

@ -5,7 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
/**
* Created by 1-point at 2021/9/7
* netty服务端配置
*/
@Data
@Component

2
collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/handler/NettyBusinessHandler.java
Unescape Escape View File

@ -13,7 +13,7 @@ import javax.annotation.Resource;
import java.net.InetSocketAddress;
/**
* Created by 1-point at 2021/9/7
* 业务消息处理
*/
@Slf4j
@ChannelHandler.Sharable

2
collector-scheduling-management/src/main/java/com/docus/server/common/netty/server/handler/NettyHeartbeatHandler.java
Unescape Escape View File

@ -11,7 +11,7 @@ import io.netty.util.ReferenceCountUtil;
import lombok.extern.slf4j.Slf4j;
/**
* Created by 1-point at 2021/9/8
* 客户端和服务端心跳
*/
@Slf4j
@ChannelHandler.Sharable

2
collector-scheduling-management/src/main/java/com/docus/server/service/impl/TaskCollectorServiceImpl.java
Unescape Escape View File

@ -17,7 +17,7 @@ import java.util.List;
* </p>
*
* @author AutoGenerator
* @since 2023-07-10
* @since 2023-07-07
*/
@Service
public class TaskCollectorServiceImpl implements ITaskCollectorService {

8
common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/process/RetryProcessor.java
Unescape Escape View File

@ -62,12 +62,16 @@ public class RetryProcessor extends AbstractProcessor {
if (error) {
taskConfigRetryLog.setLastErrorMsg(context.getExMessageResult());
taskConfigRetryLog.setState(StateEnum.FAIL);
taskConfigRetryLog.setCreateTime(new Date());
taskConfigRetryLog.setUpdateTime(new Date());
taskConfigDO.setState(StateEnum.FAIL);
taskConfigDO.setCreateTime(new Date());
taskConfigDO.setUpdateTime(new Date());
} else {
taskConfigRetryLog.setLastErrorMsg(EMPTY_STRING);
taskConfigRetryLog.setState(StateEnum.OK);
taskConfigRetryLog.setCreateTime(new Date());
taskConfigRetryLog.setUpdateTime(new Date());
taskConfigDO.setState(StateEnum.OK);
taskConfigDO.setCreateTime(new Date());
taskConfigDO.setUpdateTime(new Date());
@ -84,12 +88,16 @@ public class RetryProcessor extends AbstractProcessor {
if (error) {
taskMessageRetryLog.setErrorMsg(context.getExMessageResult());
taskMessageRetryLog.setState(StateEnum.FAIL);
taskMessageRetryLog.setCreateTime(new Date());
taskMessageRetryLog.setUpdateTime(new Date());
taskMessageDO.setState(StateEnum.FAIL);
taskMessageDO.setCreateTime(new Date());
taskMessageDO.setUpdateTime(new Date());
} else {
taskMessageRetryLog.setErrorMsg(EMPTY_STRING);
taskMessageRetryLog.setState(StateEnum.OK);
taskMessageRetryLog.setCreateTime(new Date());
taskMessageRetryLog.setUpdateTime(new Date());
taskMessageDO.setState(StateEnum.OK);
taskMessageDO.setCreateTime(new Date());
taskMessageDO.setUpdateTime(new Date());

Write Preview
Loading…
Cancel
Save