diff --git a/src/main/java/tccn/Event.java b/src/main/java/tccn/Event.java index 4ab7a72..44890ee 100644 --- a/src/main/java/tccn/Event.java +++ b/src/main/java/tccn/Event.java @@ -15,8 +15,8 @@ public class Event { this.value = value; } - public static Event of(String topic, V value) { - return new Event(topic, value); + public static Event of(String topic, V value) { + return new Event<>(topic, value); } diff --git a/src/main/java/tccn/zhub/ZHubClient.java b/src/main/java/tccn/zhub/ZHubClient.java index 6238987..99c226a 100644 --- a/src/main/java/tccn/zhub/ZHubClient.java +++ b/src/main/java/tccn/zhub/ZHubClient.java @@ -21,15 +21,14 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.UUID; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.function.BiConsumer; +import java.util.concurrent.*; import java.util.function.Consumer; import java.util.function.Function; import java.util.logging.Level; import java.util.logging.Logger; +import static java.nio.charset.StandardCharsets.UTF_8; + @Component public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer { @@ -60,12 +59,6 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer private final LinkedBlockingQueue> rpcCallQueue = new LinkedBlockingQueue<>(); // RPC CALL MSG private final LinkedBlockingQueue sendMsgQueue = new LinkedBlockingQueue<>(); // SEND MSG - private final BiConsumer threadBuilder = (r, n) -> { - for (int i = 0; i < n; i++) { - new Thread(() -> r.run()).start(); - } - }; - /*private static boolean isFirst = true; private boolean isMain = false;*/ private static final Map mainHub = new HashMap<>(); // 127.0.0.1:1216 - ZHubClient @@ -212,98 +205,117 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer }).start(); // 定时调度事件 - threadBuilder.accept(() -> { + new Thread(() -> { + ExecutorService executor = Executors.newSingleThreadExecutor(); while (true) { Timer timer = null; try { - if ((timer = timerQueue.take()) == null) { - return; - } + timer = timerQueue.take(); long start = System.currentTimeMillis(); - timer.runnable.run(); + executor.submit(timer.runnable).get(5, TimeUnit.SECONDS); long end = System.currentTimeMillis(); logger.finest(String.format("timer [%s] : elapsed time %s ms", timer.name, end - start)); - } catch (InterruptedException e) { - e.printStackTrace(); - } catch (Exception e) { - logger.log(Level.WARNING, "timer [" + timer.name + "]", e); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + if (e instanceof TimeoutException) { + executor = Executors.newSingleThreadExecutor(); + logger.log(Level.WARNING, "TimeoutException [" + timer.name + "]", e); + } else { + e.printStackTrace(); + } } } - }, 1); + }).start(); // topic msg - threadBuilder.accept(() -> { + new Thread(() -> { + ExecutorService executor = Executors.newSingleThreadExecutor(); while (true) { Event event = null; try { - if ((event = topicQueue.take()) == null) { - continue; - } + event = topicQueue.take(); logger.log(Level.FINE, "topic[" + event.topic + "] :" + event.value); - accept(event.topic, event.value); - } catch (InterruptedException e) { - e.printStackTrace(); - } catch (Exception e) { - logger.log(Level.WARNING, "topic[" + event.topic + "] event accept error :" + event.value, e); + + String topic = event.topic; + String value = event.value; + executor.submit(() -> accept(topic, value)).get(5, TimeUnit.SECONDS); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + if (e instanceof TimeoutException) { + executor = Executors.newSingleThreadExecutor(); + logger.log(Level.WARNING, "TimeoutException, topic[" + event.topic + "], value[" + event.value + "]", e); + } else if (event != null) { + logger.log(Level.WARNING, "topic[" + event.topic + "] event accept error :" + event.value, e); + } } } - }, 1); - + }, "ZHub-topic-accept").start(); // rpc back - threadBuilder.accept(() -> { + new Thread(() -> { + ExecutorService executor = Executors.newSingleThreadExecutor(); while (true) { Event event = null; try { - if ((event = rpcBackQueue.take()) == null) { - continue; - } - //if (event) + event = rpcBackQueue.take(); logger.info(String.format("rpc-back:[%s]: %s", event.topic, event.value)); rpcAccept(event.value); - } catch (InterruptedException e) { - e.printStackTrace(); - } catch (Exception e) { - logger.log(Level.WARNING, "rpc-back[" + event.topic + "] event accept error :" + event.value, e); + + String value = event.value; + executor.submit(() -> rpcAccept(value)).get(5, TimeUnit.SECONDS); + + } catch (InterruptedException | ExecutionException | TimeoutException e) { + if (e instanceof TimeoutException) { + executor = Executors.newSingleThreadExecutor(); + logger.log(Level.WARNING, "rpc-back TimeoutException, topic[" + event.topic + "], value[" + event.value + "]", e); + } else if (event != null) { + logger.log(Level.WARNING, "rpc-back[" + event.topic + "] event accept error :" + event.value, e); + } + throw new RuntimeException(e); } } - }, 1); + }).start(); // rpc call - threadBuilder.accept(() -> { + new Thread(() -> { + ExecutorService executor = Executors.newSingleThreadExecutor(); while (true) { Event event = null; try { - if ((event = rpcCallQueue.take()) == null) { - continue; - } + event = rpcCallQueue.take(); logger.info(String.format("rpc-call:[%s] %s", event.topic, event.value)); - accept(event.topic, event.value); - } catch (InterruptedException e) { - e.printStackTrace(); - } catch (Exception e) { - logger.log(Level.WARNING, "rpc-call[" + event.topic + "] event accept error :" + event.value, e); + + String topic = event.topic; + String value = event.value; + executor.submit(() -> accept(topic, value)).get(5, TimeUnit.SECONDS); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + if (e instanceof TimeoutException) { + executor = Executors.newSingleThreadExecutor(); + logger.log(Level.WARNING, "rpc-call TimeoutException, topic[" + event.topic + "], value[" + event.value + "]", e); + } else if (event != null) { + logger.log(Level.WARNING, "rpc-call[" + event.topic + "] event accept error :" + event.value, e); + } } } - }, 1); + }, "ZHub-rpc-call").start(); // send msg - threadBuilder.accept(() -> { - while (true) { - String msg = null; + new Thread(() -> { + String msg = null; + try { + msg = sendMsgQueue.take(); + writer.write(msg.getBytes(UTF_8)); + writer.flush(); + } catch (InterruptedException | IOException e) { + logger.log(Level.WARNING, "send-msg[" + msg + "] event accept error :", e); + try { - if ((msg = sendMsgQueue.take()) == null) { - continue; - } - // logger.log(Level.FINEST, "send-msg: [" + msg + "]"); - writer.write(msg.getBytes()); + Thread.sleep(3000); + assert msg != null; + writer.write(msg.getBytes(UTF_8)); writer.flush(); - } catch (InterruptedException e) { + } catch (IOException | InterruptedException | NullPointerException ex) { e.printStackTrace(); - } catch (Exception e) { - logger.log(Level.WARNING, "send-msg[" + msg + "] event accept error :", e); } } - }, 1); + }); }