Merge pull request #92 from lbay2015/master

Apphub web.xml load-on-startup params change
uavorg · Dec 8, 2017 · ccecf60 · ccecf60
2 parents a3d4c23 + 0883b8c
commit ccecf60
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/com.creditease.uav.console.buildComponent/config/web_pro.xml b/com.creditease.uav.console.buildComponent/config/web_pro.xml
@@ -33,7 +33,7 @@
 			<param-name>es.info</param-name>
 			<param-value>{"forwar.url":"http://127.0.0.1:9200,http://127.0.0.1:9200"}</param-value>
 		</init-param>
-		<load-on-startup>3</load-on-startup>
+		<load-on-startup>2</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
 
@@ -45,7 +45,7 @@
 	<servlet>
 		<servlet-name>opentsdb-agent-servlet</servlet-name>
 		<servlet-class>com.creditease.uav.opentsdb.OpenTSDBRestAgentServlet</servlet-class>
-		<load-on-startup>2</load-on-startup>
+		<load-on-startup>3</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
 
@@ -89,7 +89,6 @@
 			<param-name>log.app.enable</param-name>
 			<param-value>true</param-value>
 		</init-param>
-		<load-on-startup>2</load-on-startup>
 		<async-supported>true</async-supported>
     </filter>
     <filter-mapping>

diff --git a/com.creditease.uav.console.buildComponent/config/web_test.xml b/com.creditease.uav.console.buildComponent/config/web_test.xml
@@ -33,7 +33,7 @@
 			<param-name>es.info</param-name>
 			<param-value>{"forwar.url":"http://127.0.0.1:9200,http://127.0.0.1:9200"}</param-value>
 		</init-param>
-		<load-on-startup>3</load-on-startup>
+		<load-on-startup>2</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
 
@@ -45,7 +45,7 @@
 	<servlet>
 		<servlet-name>opentsdb-agent-servlet</servlet-name>
 		<servlet-class>com.creditease.uav.opentsdb.OpenTSDBRestAgentServlet</servlet-class>
-		<load-on-startup>2</load-on-startup>
+		<load-on-startup>3</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
 
@@ -89,7 +89,6 @@
 			<param-name>log.app.enable</param-name>
 			<param-value>true</param-value>
 		</init-param>
-		<load-on-startup>2</load-on-startup>
 		<async-supported>true</async-supported>
     </filter>
     <filter-mapping>

diff --git a/com.creditease.uav.console/src/main/webapp/WEB-INF/web.xml b/com.creditease.uav.console/src/main/webapp/WEB-INF/web.xml
@@ -32,7 +32,7 @@
 			<param-name>es.info</param-name>
 			<param-value>{"forwar.url":"http://localhost:9200"}</param-value>
 		</init-param>
-		<load-on-startup>3</load-on-startup>
+		<load-on-startup>2</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
 
@@ -44,7 +44,7 @@
 	<servlet>
 		<servlet-name>opentsdb-agent-servlet</servlet-name>
 		<servlet-class>com.creditease.uav.opentsdb.OpenTSDBRestAgentServlet</servlet-class>
-		<load-on-startup>2</load-on-startup>
+		<load-on-startup>3</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
 
@@ -88,7 +88,6 @@
 			<param-name>log.app.enable</param-name>
 			<param-value>true</param-value>
 		</init-param>
-		<load-on-startup>2</load-on-startup>
 		<async-supported>true</async-supported>
     </filter>
     <filter-mapping>