Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/支持多集群 #5

Merged
merged 4 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
1.2.16
1.支持多集群客户端,服务端
2.支持统计用户在系统精准的使用时间
  • Loading branch information
wangzihao committed Jun 4, 2024
commit 0e3210839d17502638d5e5749b3e2ecb300690a8
3 changes: 3 additions & 0 deletions src/main/java/com/github/sseserver/local/LocalController.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ public void registerInstance() {
}
InetSocketAddress address = httpServer.getAddress();
ServiceDiscoveryService discoveryService = discoverySupplier.get();
if (discoveryService == null) {
return;
}
for (int i = 0, retry = 3; i < retry; i++) {
try {
discoveryService.registerInstance(address.getAddress().getHostAddress(), address.getPort());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/sseserver/qos/Message.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public interface Message extends Serializable {
int FILTER_CHANNEL = (1 << 5);

static String newId(String type, String serverId) {
return type + "" + serverId + "-" + SnowflakeIdWorker.INSTANCE.nextId();
return type + serverId + "-" + SnowflakeIdWorker.INSTANCE.nextId();
}

String getListenerName();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public enum ClusterRoleEnum {
SseServerBeanDefinitionRegistrar.registerAtLeastOnce
)),
CLIENT(Arrays.asList(
SseServerBeanDefinitionRegistrar.registerLocalMessageRepository,
SseServerBeanDefinitionRegistrar.registerClusterConnectionService,
SseServerBeanDefinitionRegistrar.registerClusterMessageRepository,
SseServerBeanDefinitionRegistrar.registerServiceDiscoveryService,
Expand Down
7 changes: 7 additions & 0 deletions src/test/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ spring:
sse-server:
remote:
enabled: true
cluster:
c1:
role: client
redis:
redis-connection-factory-bean-name: c1redis
c2:
role: server

redis:
host: localhost
Expand Down