Authored by ping

update

1 set JAVA_MEM_OPT= -Xms1024m -Xmx1024m -XX:MaxPermSize=128m -Djava.net.preferIPv4Stack=true 1 set JAVA_MEM_OPT= -Xms1024m -Xmx1024m -XX:MaxPermSize=128m -Djava.net.preferIPv4Stack=true
2 -set JAVA_HOME=C:/Program Files/Java/jdk1.8.0_60  
3 -set WEB_APP_HOME=$yohobuy.resources.env.webapphome 2 +set JAVA_HOME=$yoho.env.javahome
  3 +set WEB_APP_HOME=/home/test/yohobuy-union/deploy
4 4
5 5
6 -set CATALINA_HOME=D:/JavaTools/apache-tomcat-8.0.28  
7 -set CATALINA_BASE=$yohobuy.resources.env.webapphome/tomcat_server  
8 6
9 7
10 rem set JAVA_DEBUG_OPT= -server -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8082,server=y,suspend=n 8 rem set JAVA_DEBUG_OPT= -server -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8082,server=y,suspend=n
@@ -5,24 +5,24 @@ @@ -5,24 +5,24 @@
5 BASE_BIN_DIR=`dirname $0` 5 BASE_BIN_DIR=`dirname $0`
6 . $BASE_BIN_DIR/functions.sh 6 . $BASE_BIN_DIR/functions.sh
7 7
8 -export JAVA_HOME=C:/Program Files/Java/jdk1.8.0_60  
9 -export WEB_APP_HOME=$yohobuy.resources.env.webapphome  
10 -export SERVER_PORT=0  
11 -export PRODUCTION_MODE="PRODUCT"  
12 -export SERVER_HOME=D:/JavaTools/apache-tomcat-8.0.28  
13 -export SERVER_TYPE=tomcat  
14 -export SERVER_NAMESPACE=yohobuy-resources 8 +export JAVA_HOME=$yoho.env.javahome
  9 +export WEB_APP_HOME=/home/test/yohobuy-union/deploy
  10 +export SERVER_PORT=8
  11 +export PRODUCTION_MODE="$yoho.env.productmode"
  12 +export SERVER_HOME=$yoho.env.serverhome
  13 +export SERVER_TYPE=$yoho.env.servertype
  14 +export SERVER_NAMESPACE=unions
15 15
16 16
17 - export SERVER_BASE_DIR=" -Dcatalina.base=$yohobuy.resources.env.webapphome/.tomcat "  
18 17
19 export NAMING_PORT=`expr 9000 + $SERVER_PORT` 18 export NAMING_PORT=`expr 9000 + $SERVER_PORT`
20 export HTTP_SERVER_PORT=`expr 8080 + $SERVER_PORT` 19 export HTTP_SERVER_PORT=`expr 8080 + $SERVER_PORT`
  20 +export DEBUG_PORT=`expr 8800 + $SERVER_PORT`
21 21
22 export CHECK_SERVER_STARTUP_URL="http://127.0.0.1:$HTTP_SERVER_PORT/$SERVER_NAMESPACE/common/ok.jsp" 22 export CHECK_SERVER_STARTUP_URL="http://127.0.0.1:$HTTP_SERVER_PORT/$SERVER_NAMESPACE/common/ok.jsp"
23 export STARTUP_SUCCESS_MSG="Server Online Resources ok" 23 export STARTUP_SUCCESS_MSG="Server Online Resources ok"
24 export JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true " 24 export JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true "
25 -export JAVA_DEBUG_OPT=" -server -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=,server=y,suspend=n " 25 +export JAVA_DEBUG_OPT=" -server -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$DEBUG_PORT,server=y,suspend=n "
26 export TIGER_JMX_OPT=" -Dcom.sun.management.config.file=$WEB_APP_HOME/conf/jmx/jmx_monitor_management.properties " 26 export TIGER_JMX_OPT=" -Dcom.sun.management.config.file=$WEB_APP_HOME/conf/jmx/jmx_monitor_management.properties "
27 27
28 28
@@ -60,6 +60,7 @@ if [ $PRODUCTION_MODE = "PRODUCT" ]; then @@ -60,6 +60,7 @@ if [ $PRODUCTION_MODE = "PRODUCT" ]; then
60 60
61 elif [ $PRODUCTION_MODE = "TEST" ]; then 61 elif [ $PRODUCTION_MODE = "TEST" ]; then
62 JAVA_MEM_OPTS=" -server -Xms1024m -Xmx1024m -XX:MaxPermSize=128m -XX:SurvivorRatio=2 -XX:+UseParallelGC " 62 JAVA_MEM_OPTS=" -server -Xms1024m -Xmx1024m -XX:MaxPermSize=128m -XX:SurvivorRatio=2 -XX:+UseParallelGC "
  63 + JAVA_OPTS=" $JAVA_OPTS $JAVA_MEM_OPTS "
63 elif [ $PRODUCTION_MODE = "DEV" ]; then 64 elif [ $PRODUCTION_MODE = "DEV" ]; then
64 #we shuold reduce resource usage on developing mode 65 #we shuold reduce resource usage on developing mode
65 JAVA_MEM_OPTS=" -server -Xms64m -Xmx1024m -XX:MaxPermSize=128m " 66 JAVA_MEM_OPTS=" -server -Xms64m -Xmx1024m -XX:MaxPermSize=128m "
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 define subcomponents such as "Valves" at this level. 19 define subcomponents such as "Valves" at this level.
20 Documentation at /docs/config/server.html 20 Documentation at /docs/config/server.html
21 --> 21 -->
22 -<Server port="8100" shutdown="SHUTDOWN"> 22 +<Server port="8108" shutdown="SHUTDOWN">
23 <Listener className="org.apache.catalina.startup.VersionLoggerListener" /> 23 <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
24 <!-- Security listener. Documentation at /docs/config/listeners.html 24 <!-- Security listener. Documentation at /docs/config/listeners.html
25 <Listener className="org.apache.catalina.security.SecurityListener" /> 25 <Listener className="org.apache.catalina.security.SecurityListener" />
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 APR (HTTP/AJP) Connector: /docs/apr.html 66 APR (HTTP/AJP) Connector: /docs/apr.html
67 Define a non-SSL/TLS HTTP/1.1 Connector on port 8080 67 Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
68 --> 68 -->
69 - <Connector port="8080" protocol="HTTP/1.1" 69 + <Connector port="8088" protocol="HTTP/1.1"
70 connectionTimeout="20000" 70 connectionTimeout="20000"
71 redirectPort="8443" /> 71 redirectPort="8443" />
72 <!-- A "Connector" using the shared thread pool--> 72 <!-- A "Connector" using the shared thread pool-->
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 --> 88 -->
89 89
90 <!-- Define an AJP 1.3 Connector on port 8009 --> 90 <!-- Define an AJP 1.3 Connector on port 8009 -->
91 - <Connector port="8000" protocol="AJP/1.3" redirectPort="8443" /> 91 + <Connector port="8008" protocol="AJP/1.3" redirectPort="8443" />
92 92
93 93
94 <!-- An Engine represents the entry point (within Catalina) that processes 94 <!-- An Engine represents the entry point (within Catalina) that processes
@@ -10,4 +10,10 @@ rabbit.mq.password=yoho @@ -10,4 +10,10 @@ rabbit.mq.password=yoho
10 rabbit.mq.virtualHost=/yoho 10 rabbit.mq.virtualHost=/yoho
11 11
12 #激活有效期(秒) 12 #激活有效期(秒)
13 -activeTime=3600  
  13 +activeTime=3600
  14 +
  15 +
  16 +
  17 +zkAddress=192.168.102.162:32806
  18 +# web context
  19 +web.context=unions
1 -  
2 -zkAddress=192.168.102.162:32806  
3 -# web context  
4 -web.context=unions  
@@ -12,4 +12,10 @@ rabbit.mq.virtualHost=${rabbit.mq.virtualHost} @@ -12,4 +12,10 @@ rabbit.mq.virtualHost=${rabbit.mq.virtualHost}
12 #激活有效期(秒) 12 #激活有效期(秒)
13 activeTime=${activeTime} 13 activeTime=${activeTime}
14 14
15 -yoho.unions.env.namespace=unions  
  15 +yoho.unions.env.namespace=unions
  16 +
  17 +
  18 +#zookeeper地址
  19 +zkAddress=${zkAddress}
  20 +# web context
  21 +web.context=unions
1 -#zookeeper地址  
2 -zkAddress=${zkAddress}  
3 -# web context  
4 -web.context=unions