From 9bd79b9273c3ff81f7152d060fd79f85ec8569d8 Mon Sep 17 00:00:00 2001
From: pengys5 <8082209@qq.com>
Date: Sat, 9 Sep 2017 21:31:45 +0800
Subject: [PATCH] Change ui jetty server discovery port change to 10800

---
 .../jetty/AgentServerJettyModuleDefine.java   |  2 +
 .../jetty/handler/UIJettyServerHandler.java   |  2 +-
 .../src/main/resources/application.yml        | 43 +++++++++++--------
 .../ui/jetty/UIJettyModuleDefine.java         |  2 -
 4 files changed, 28 insertions(+), 21 deletions(-)
 rename apm-collector/{apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui => apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver}/jetty/handler/UIJettyServerHandler.java (95%)

diff --git a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java
index 43314323c3..4540b468ae 100644
--- a/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java
+++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/AgentServerJettyModuleDefine.java
@@ -6,6 +6,7 @@ import org.skywalking.apm.collector.agentserver.AgentServerModuleDefine;
 import org.skywalking.apm.collector.agentserver.AgentServerModuleGroupDefine;
 import org.skywalking.apm.collector.agentserver.jetty.handler.AgentStreamGRPCServerHandler;
 import org.skywalking.apm.collector.agentserver.jetty.handler.AgentStreamJettyServerHandler;
+import org.skywalking.apm.collector.agentserver.jetty.handler.UIJettyServerHandler;
 import org.skywalking.apm.collector.core.cluster.ClusterDataListener;
 import org.skywalking.apm.collector.core.framework.Handler;
 import org.skywalking.apm.collector.core.module.ModuleConfigParser;
@@ -52,6 +53,7 @@ public class AgentServerJettyModuleDefine extends AgentServerModuleDefine {
         List<Handler> handlers = new LinkedList<>();
         handlers.add(new AgentStreamGRPCServerHandler());
         handlers.add(new AgentStreamJettyServerHandler());
+        handlers.add(new UIJettyServerHandler());
         return handlers;
     }
 }
diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/UIJettyServerHandler.java b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/UIJettyServerHandler.java
similarity index 95%
rename from apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/UIJettyServerHandler.java
rename to apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/UIJettyServerHandler.java
index 78b49cd422..d38868f38f 100644
--- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/handler/UIJettyServerHandler.java
+++ b/apm-collector/apm-collector-agentserver/src/main/java/org/skywalking/apm/collector/agentserver/jetty/handler/UIJettyServerHandler.java
@@ -1,4 +1,4 @@
-package org.skywalking.apm.collector.ui.jetty.handler;
+package org.skywalking.apm.collector.agentserver.jetty.handler;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
diff --git a/apm-collector/apm-collector-boot/src/main/resources/application.yml b/apm-collector/apm-collector-boot/src/main/resources/application.yml
index 6288846fc6..2477d79ece 100644
--- a/apm-collector/apm-collector-boot/src/main/resources/application.yml
+++ b/apm-collector/apm-collector-boot/src/main/resources/application.yml
@@ -2,25 +2,32 @@ cluster:
   zookeeper:
     hostPort: localhost:2181
     sessionTimeout: 100000
-#  redis:
+#agent_server:
+#  jetty:
 #    host: localhost
-#    port: 6379
-agentstream:
-  grpc:
-    host: localhost
-    port: 1000
-  jetty:
-    host: localhost
-    port: 2000
-    context_path: /
-discovery:
-  grpc: localhost
-  port: 1000
-ui:
-  jetty:
-    host: localhost
-    port: 12800
-    context_path: /
+#    port: 10800
+#    context_path: /
+#agent_register:
+#  grpc:
+#    host: localhost
+#    port: 11800
+#  jetty:
+#    host: localhost
+#    port: 12800
+#    context_path: /
+#agent_stream:
+#  grpc:
+#    host: localhost
+#    port: 11800
+#  jetty:
+#    host: localhost
+#    port: 12800
+#    context_path: /
+#ui:
+#  jetty:
+#    host: localhost
+#    port: 12800
+#    context_path: /
 storage:
   elasticsearch:
     cluster_name: CollectorDBCluster
diff --git a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java
index 5e23921719..90ae41b5a7 100644
--- a/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java
+++ b/apm-collector/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/jetty/UIJettyModuleDefine.java
@@ -14,7 +14,6 @@ import org.skywalking.apm.collector.ui.jetty.handler.SegmentTopGetHandler;
 import org.skywalking.apm.collector.ui.jetty.handler.SpanGetHandler;
 import org.skywalking.apm.collector.ui.jetty.handler.TraceDagGetHandler;
 import org.skywalking.apm.collector.ui.jetty.handler.TraceStackGetHandler;
-import org.skywalking.apm.collector.ui.jetty.handler.UIJettyServerHandler;
 import org.skywalking.apm.collector.ui.jetty.handler.application.ApplicationsGetHandler;
 import org.skywalking.apm.collector.ui.jetty.handler.instancehealth.InstanceHealthGetHandler;
 import org.skywalking.apm.collector.ui.jetty.handler.instancemetric.InstanceMetricGetOneTimeBucketHandler;
@@ -59,7 +58,6 @@ public class UIJettyModuleDefine extends UIModuleDefine {
 
     @Override public List<Handler> handlerList() {
         List<Handler> handlers = new LinkedList<>();
-        handlers.add(new UIJettyServerHandler());
         handlers.add(new TraceDagGetHandler());
         handlers.add(new SegmentTopGetHandler());
         handlers.add(new TraceStackGetHandler());
-- 
GitLab