lxy/zhub-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lxy:11ed5d2018f989ddd7870448bf97928ba1df436b
Branches Tags
lxy:master
lxy:dev/redkale-2.2
lxy:dev/zhub-cli
lxy:dev/springboot-1.8
lxy:dev/redkale
lxy:dev/redkale-x
lxy:dev/springboot-17
lxy:dev/springboot
..
compare: lxy:2e0d9af014df86cdf9ef45db56e11e24111e4346
Branches Tags
lxy:dev/redkale-2.2
lxy:dev/zhub-cli
lxy:dev/springboot-1.8
lxy:dev/redkale
lxy:dev/redkale-x
lxy:dev/springboot-17
lxy:dev/springboot
lxy:master

No commits in common. "11ed5d2018f989ddd7870448bf97928ba1df436b" and "2e0d9af014df86cdf9ef45db56e11e24111e4346" have entirely different histories.
11ed5d2018 ... 2e0d9af014

3 changed files with 65 additions and 71 deletions
Show Stats Expand all files Collapse all files

8
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>net.tccn</groupId> <groupId>net.tccn</groupId>
<artifactId>zhub-client-redkale</artifactId> <artifactId>zhub-client-redkale</artifactId>
<version>0.1.1.dev</version> <version>0.1.1-dev</version>
<properties> <properties>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
@ -18,7 +18,7 @@
<dependency> <dependency>
<groupId>org.redkale</groupId> <groupId>org.redkale</groupId>
<artifactId>redkale</artifactId> <artifactId>redkale</artifactId>
<version>2.8.0.dev</version> <version>2.8.0-dev</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -34,7 +34,7 @@
<repository> <repository>
<id>maven-nexus</id> <id>maven-nexus</id>
<name>maven-nexus</name> <name>maven-nexus</name>
<url>https://nexus.1216.top/repository/maven-public/</url> <url>http://47.106.237.198:8081/repository/maven-public/</url>
</repository> </repository>
</repositories> </repositories>
@ -43,7 +43,7 @@
<repository> <repository>
<id>mvn-release</id> <id>mvn-release</id>
<name>mvn-release</name> <name>mvn-release</name>
<url>https://nexus.1216.top/repository/maven-releases/</url> <url>http://47.106.237.198:8081/repository/maven-releases/</url>
</repository> </repository>
</distributionManagement> </distributionManagement>
</project> </project>

4
src/main/java/net/tccn/Event.java
View File

@ -15,8 +15,8 @@ public class Event<V> {
this.value = value; this.value = value;
} }
public static <V> Event<V> of(String topic, V value) { public static <V> Event of(String topic, V value) {
return new Event<>(topic, value); return new Event<V>(topic, value);
} }

124
src/main/java/net/tccn/zhub/ZHubClient.java
View File

@ -25,8 +25,6 @@ import java.util.function.Function;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import static java.nio.charset.StandardCharsets.UTF_8;
@Local @Local
@AutoLoad(false) @AutoLoad(false)
@ResourceType(ZHubClient.class) @ResourceType(ZHubClient.class)
@ -223,114 +221,110 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
}).thenAcceptAsync(x -> { }).thenAcceptAsync(x -> {
// 定时调度事件，已加入耗时监控 // 定时调度事件，已加入耗时监控
new Thread(() -> { new Thread(() -> {
ExecutorService executor = Executors.newSingleThreadExecutor(); ExecutorService pool = Executors.newFixedThreadPool(1);
while (true) { while (true) {
Timer timer = null; Timer timer = null;
try { try {
timer = timerQueue.take(); if ((timer = timerQueue.take()) == null) {
return;
}
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
executor.submit(timer.runnable).get(5, TimeUnit.SECONDS); pool.submit(timer.runnable).get(5, TimeUnit.SECONDS);
long end = System.currentTimeMillis(); long end = System.currentTimeMillis();
logger.finest(String.format("timer [%s] : elapsed time %s ms", timer.name, end - start)); logger.finest(String.format("timer [%s] : elapsed time %s ms", timer.name, end - start));
} catch (InterruptedException | ExecutionException | TimeoutException e) { } catch (InterruptedException e) {
if (e instanceof TimeoutException) { e.printStackTrace();
executor = Executors.newSingleThreadExecutor(); } catch (TimeoutException e) {
logger.log(Level.WARNING, "TimeoutException [" + timer.name + "]", e); logger.log(Level.SEVERE, "timer [" + timer.name + "] time out: " + 5 + " S", e);
} else { pool = Executors.newFixedThreadPool(1);
e.printStackTrace(); } catch (Exception e) {
} logger.log(Level.WARNING, "timer [" + timer.name + "]", e);
} }
} }
}).start(); }).start();
// topic msg，已加入耗时监控 // topic msg，已加入耗时监控
new Thread(() -> { new Thread(() -> {
ExecutorService executor = Executors.newSingleThreadExecutor(); ExecutorService pool = Executors.newFixedThreadPool(1);
while (true) { while (true) {
Event<String> event = null; Event<String> event = null;
try { try {
event = topicQueue.take(); if ((event = topicQueue.take()) == null) {
logger.log(Level.FINE, "topic[" + event.topic + "] :" + event.value); continue;
}
String topic = event.topic; String topic = event.topic;
String value = event.value; String value = event.value;
executor.submit(() -> accept(topic, value)).get(5, TimeUnit.SECONDS); pool.submit(() -> accept(topic, value)).get(5, TimeUnit.SECONDS);
} catch (InterruptedException | ExecutionException | TimeoutException e) { } catch (InterruptedException e) {
if (e instanceof TimeoutException) { e.printStackTrace();
executor = Executors.newSingleThreadExecutor(); } catch (TimeoutException e) {
logger.log(Level.WARNING, "TimeoutException, topic[" + event.topic + "], value[" + event.value + "]", e); logger.log(Level.SEVERE, "topic[" + event.topic + "] event deal time out: " + 5 + " S, value: " + event.value, e);
} else if (event != null) { pool = Executors.newFixedThreadPool(1);
logger.log(Level.WARNING, "topic[" + event.topic + "] event accept error :" + event.value, e); } catch (Exception e) {
} logger.log(Level.WARNING, "topic[" + event.topic + "] event accept error :" + event.value, e);
} }
} }
}, "ZHub-topic-accept").start(); }).start();
// rpc back ,仅做数据解析，暂无耗时监控 // rpc back ,仅做数据解析，暂无耗时监控
new Thread(() -> { new Thread(() -> {
ExecutorService executor = Executors.newSingleThreadExecutor();
while (true) { while (true) {
Event<String> event = null; Event<String> event = null;
try { try {
event = rpcCallQueue.take(); if ((event = rpcBackQueue.take()) == null) {
logger.info(String.format("rpc-call:[%s] %s", event.topic, event.value)); continue;
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);
} }
//if (event)
logger.finest(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);
} }
} }
}, "ZHub-rpc-call").start(); }).start();
// rpc call，已加入耗时监控 // rpc call，已加入耗时监控
new Thread(() -> { new Thread(() -> {
ExecutorService executor = Executors.newSingleThreadExecutor(); ExecutorService pool = Executors.newFixedThreadPool(1);
while (true) { while (true) {
Event<String> event = null; Event<String> event = null;
try { try {
event = rpcCallQueue.take(); if ((event = rpcCallQueue.take()) == null) {
logger.info(String.format("rpc-call:[%s] %s", event.topic, event.value)); continue;
}
logger.finest(String.format("rpc-call:[%s] %s", event.topic, event.value));
String topic = event.topic; String topic = event.topic;
String value = event.value; String value = event.value;
executor.submit(() -> accept(topic, value)).get(5, TimeUnit.SECONDS); pool.submit(() -> accept(topic, value)).get(5, TimeUnit.SECONDS);
} catch (InterruptedException | ExecutionException | TimeoutException e) { } catch (InterruptedException e) {
if (e instanceof TimeoutException) { e.printStackTrace();
executor = Executors.newSingleThreadExecutor(); } catch (TimeoutException e) {
logger.log(Level.WARNING, "rpc-call TimeoutException, topic[" + event.topic + "], value[" + event.value + "]", e); logger.log(Level.SEVERE, "topic[" + event.topic + "] event deal time out: " + 5 + " S, value: " + event.value, e);
} else if (event != null) { pool = Executors.newFixedThreadPool(1);
logger.log(Level.WARNING, "rpc-call[" + event.topic + "] event accept error :" + event.value, e); } catch (Exception e) {
} logger.log(Level.WARNING, "rpc-call[" + event.topic + "] event accept error :" + event.value, e);
} }
} }
}, "ZHub-rpc-call").start(); }).start();
// send msg // send msg
new Thread(() -> { new Thread(() -> {
while (true) { while (true) {
String msg = null; String msg = null;
try { try {
msg = sendMsgQueue.take(); if ((msg = sendMsgQueue.take()) == null) {
writer.write(msg.getBytes(UTF_8)); continue;
writer.flush();
} catch (InterruptedException | IOException e) {
logger.log(Level.WARNING, "send-msg[" + msg + "] event accept error :", e);
try {
Thread.sleep(5000);
assert msg != null;
writer.write(msg.getBytes(UTF_8));
writer.flush();
} catch (IOException | InterruptedException | NullPointerException ex) {
e.printStackTrace();
} }
// logger.log(Level.FINEST, "send-msg: [" + msg + "]");
writer.write(msg.getBytes());
writer.flush();
} catch (InterruptedException e) {
e.printStackTrace();
} catch (Exception e) {
logger.log(Level.WARNING, "send-msg[" + msg + "] event accept error :", e);
} }
} }
}).start(); }).start();
@ -429,7 +423,7 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
client.setKeepAlive(true); client.setKeepAlive(true);
writer = client.getOutputStream(); writer = client.getOutputStream();
reader = new BufferedReader(new InputStreamReader(client.getInputStream(), UTF_8)); reader = new BufferedReader(new InputStreamReader(client.getInputStream()));
String groupid = getGroupid(); String groupid = getGroupid();
if (groupid == null || groupid.isEmpty()) { if (groupid == null || groupid.isEmpty()) {