You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by jo...@apache.org on 2023/02/12 04:34:05 UTC
[incubator-eventmesh] branch master updated: [ISSUE #3108] Remove EventMeshServer duplicate code and polish code style (#3113)
This is an automated email from the ASF dual-hosted git repository.
jonyang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 7ee764e73 [ISSUE #3108] Remove EventMeshServer duplicate code and polish code style (#3113)
7ee764e73 is described below
commit 7ee764e73f428adafac6903a275f8582f2ab0008
Author: mxsm <lj...@gmail.com>
AuthorDate: Sun Feb 12 12:34:01 2023 +0800
[ISSUE #3108] Remove EventMeshServer duplicate code and polish code style (#3113)
---
.../org/apache/eventmesh/runtime/boot/EventMeshServer.java | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java
index a6595a70e..e8eddb296 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java
@@ -65,7 +65,6 @@ public class EventMeshServer {
this.registry = new Registry();
trace = new Trace(configuration.isEventMeshServerTraceEnable());
this.connectorResource = new ConnectorResource();
- trace = new Trace(configuration.isEventMeshServerTraceEnable());
final List<String> provideServerProtocols = configuration.getEventMeshProvideServerProtocols();
for (final String provideServerProtocol : provideServerProtocols) {
@@ -117,17 +116,13 @@ public class EventMeshServer {
}
}
- if (Objects.nonNull(eventMeshTCPServer) && Objects.nonNull(eventMeshHTTPServer)
- && Objects.nonNull(eventMeshGrpcServer)) {
- clientManageController = new ClientManageController(eventMeshTCPServer,
- eventMeshHTTPServer, eventMeshGrpcServer, registry);
+ if (Objects.nonNull(eventMeshTCPServer) && Objects.nonNull(eventMeshHTTPServer) && Objects.nonNull(eventMeshGrpcServer)) {
+ clientManageController = new ClientManageController(eventMeshTCPServer, eventMeshHTTPServer, eventMeshGrpcServer, registry);
clientManageController.setAdminWebHookConfigOperationManage(eventMeshTCPServer.getAdminWebHookConfigOperationManage());
-
}
- final String eventStore = System
- .getProperty(EventMeshConstants.EVENT_STORE_PROPERTIES, System.getenv(EventMeshConstants.EVENT_STORE_ENV));
+ final String eventStore = System.getProperty(EventMeshConstants.EVENT_STORE_PROPERTIES, System.getenv(EventMeshConstants.EVENT_STORE_ENV));
if (LOGGER.isInfoEnabled()) {
LOGGER.info("eventStore : {}", eventStore);
@@ -177,8 +172,7 @@ public class EventMeshServer {
eventMeshBootstrap.shutdown();
}
- if (configuration != null
- && configuration.isEventMeshServerRegistryEnable()) {
+ if (configuration != null && configuration.isEventMeshServerRegistryEnable()) {
registry.shutdown();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org