Исправлено заполнение pcap фильтра при запуске, добавлен вывод состояния очереди

This commit is contained in:
sshkurov
2022-02-06 08:52:09 +03:00
parent 6bfa09d960
commit 56ed2f5878
13 changed files with 103 additions and 31 deletions

View File

@@ -15,6 +15,7 @@ import ru.serega6531.packmate.model.pojo.PatternDto;
import ru.serega6531.packmate.model.pojo.SubscriptionMessage;
import ru.serega6531.packmate.repository.PatternRepository;
import javax.annotation.PostConstruct;
import java.time.Instant;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -40,7 +41,10 @@ public class PatternService {
this.streamService = streamService;
this.subscriptionService = subscriptionService;
this.modelMapper = modelMapper;
}
@PostConstruct
public void init() {
repository.findAll().forEach(p -> patterns.put(p.getId(), p));
log.info("Loaded {} patterns", patterns.size());
}

View File

@@ -54,4 +54,8 @@ public class PcapService {
worker.setFilter(filter);
}
public String getExecutorState() {
return worker.getExecutorState();
}
}

View File

@@ -12,12 +12,10 @@ import ru.serega6531.packmate.model.pojo.ServiceDto;
import ru.serega6531.packmate.model.pojo.SubscriptionMessage;
import ru.serega6531.packmate.repository.ServiceRepository;
import javax.annotation.PostConstruct;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.*;
@Service
@Slf4j
@@ -43,7 +41,10 @@ public class ServicesService {
this.pcapService = pcapService;
this.modelMapper = modelMapper;
this.localIp = InetAddress.getByName(localIpString);
}
@PostConstruct
public void init() {
repository.findAll().forEach(s -> services.put(s.getPort(), s));
log.info("Loaded {} services", services.size());
}
@@ -78,7 +79,7 @@ public class ServicesService {
subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.DELETE_SERVICE, port));
pcapService.updateFilter(findAll());
updateFilter();
}
public CtfService save(CtfService service) {
@@ -89,11 +90,15 @@ public class ServicesService {
subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.SAVE_SERVICE, toDto(saved)));
pcapService.updateFilter(findAll());
updateFilter();
return saved;
}
public void updateFilter() {
pcapService.updateFilter(findAll());
}
public ServiceDto toDto(CtfService service) {
return modelMapper.map(service, ServiceDto.class);
}