From 1a3fddcd3cf65df9f19addf677df38323d258894 Mon Sep 17 00:00:00 2001 From: "william.liangf" Date: Wed, 30 Nov 2011 19:27:38 +0000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@487 1a56cb94-b969-4eaa-88fa-be21384802f2 --- .../src/main/assembly/bin/startup.sh | 26 +++---------------- .../src/main/assembly/conf/dubbo.properties | 4 +-- .../src/main/assembly/conf/dubbo.properties | 4 +-- .../src/main/assembly/conf/dubbo.properties | 4 +-- 4 files changed, 10 insertions(+), 28 deletions(-) diff --git a/dubbo-demo-consumer/src/main/assembly/bin/startup.sh b/dubbo-demo-consumer/src/main/assembly/bin/startup.sh index 982df4ef4..c691b0f34 100644 --- a/dubbo-demo-consumer/src/main/assembly/bin/startup.sh +++ b/dubbo-demo-consumer/src/main/assembly/bin/startup.sh @@ -5,25 +5,15 @@ cd .. DEPLOY_DIR=`pwd` CONF_DIR=$DEPLOY_DIR/conf LIB_DIR=$DEPLOY_DIR/lib +LOGS_DIR=$DEPLOY_DIR/logs +STDOUT_FILE=$LOGS_DIR/stdout.log CR=`echo -e "\0015\c"` -SERVER_PORT=`sed '/dubbo.protocol.port/!d;s/.*=//' conf/dubbo.properties | sed -e "s/$CR//g"` SERVER_NAME=`sed '/dubbo.application.name/!d;s/.*=//' conf/dubbo.properties | sed -e "s/$CR//g"` -LOGS_FILE=`sed '/dubbo.log4j.file/!d;s/.*=//' conf/dubbo.properties | sed -e "s/$CR//g"` -LOGS_DIR=`dirname $LOGS_FILE` -STDOUT_FILE=$LOGS_DIR/stdout.log if [ ! -d $LOGS_DIR ]; then mkdir $LOGS_DIR fi -SERVER_PORT_COUNT=`netstat -tln | grep $SERVER_PORT | wc -l` -if [ $SERVER_PORT_COUNT -gt 0 ]; then - echo "********************************************************************" - echo "** Error: $SERVER_NAME port $SERVER_PORT already used!" - echo "********************************************************************" - exit 1 -fi - JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true " JAVA_DEBUG_OPTS="" if [ "$1" = "debug" ]; then @@ -51,18 +41,10 @@ fi LIB_JARS=`ls $LIB_DIR|grep .jar|awk '{print "'$LIB_DIR'/"$0}'|tr "\n" ":"` -echo -e "Starting $SERVER_NAME on $SERVER_PORT \c" +echo -e "Starting $SERVER_NAME \c" + nohup java $JAVA_OPTS $JAVA_MEM_OPTS $JAVA_DEBUG_OPTS -classpath $CONF_DIR:$LIB_JARS com.alibaba.dubbo.demo.consumer.DemoConsumer > $STDOUT_FILE 2>&1 & -COUNT=0 -while [ $COUNT -lt 1 ]; do - echo -e ".\c" - sleep 1 - COUNT=`echo status | nc 127.0.0.1 $SERVER_PORT -i 1 | grep -c OK` - if [ $COUNT -gt 0 ]; then - break - fi -done echo "OK!" START_PIDS=`ps --no-heading -C java -f --width 1000 | grep "$DEPLOY_DIR" |awk '{print $2}'` echo "PID: $START_PIDS" diff --git a/dubbo-demo-consumer/src/main/assembly/conf/dubbo.properties b/dubbo-demo-consumer/src/main/assembly/conf/dubbo.properties index 3a38617a0..cd78d3825 100644 --- a/dubbo-demo-consumer/src/main/assembly/conf/dubbo.properties +++ b/dubbo-demo-consumer/src/main/assembly/conf/dubbo.properties @@ -1,4 +1,4 @@ dubbo.application.name=demo-consumer -#dubbo.registry.address=multicast://224.5.6.7:1234 +dubbo.registry.address=multicast://224.5.6.7:1234 #dubbo.registry.address=zookeeper://127.0.0.1:2181 -dubbo.registry.address=dubbo://127.0.0.1:9090 \ No newline at end of file +#dubbo.registry.address=dubbo://127.0.0.1:9090 \ No newline at end of file diff --git a/dubbo-demo-provider/src/main/assembly/conf/dubbo.properties b/dubbo-demo-provider/src/main/assembly/conf/dubbo.properties index 210cf9b67..f0b1a1f28 100644 --- a/dubbo-demo-provider/src/main/assembly/conf/dubbo.properties +++ b/dubbo-demo-provider/src/main/assembly/conf/dubbo.properties @@ -1,7 +1,7 @@ dubbo.application.name=demo-provider -#dubbo.registry.address=multicast://224.5.6.7:1234 +dubbo.registry.address=multicast://224.5.6.7:1234 #dubbo.registry.address=zookeeper://127.0.0.1:2181 -dubbo.registry.address=dubbo://127.0.0.1:9090 +#dubbo.registry.address=dubbo://127.0.0.1:9090 dubbo.protocol.port=20880 dubbo.jetty.port=30880 dubbo.jetty.pages=index,registries,registered,status,log,system diff --git a/dubbo-monitor-simple/src/main/assembly/conf/dubbo.properties b/dubbo-monitor-simple/src/main/assembly/conf/dubbo.properties index 6e8c80279..dfdde1465 100644 --- a/dubbo-monitor-simple/src/main/assembly/conf/dubbo.properties +++ b/dubbo-monitor-simple/src/main/assembly/conf/dubbo.properties @@ -1,7 +1,7 @@ dubbo.application.name=simple-monitor -#dubbo.registry.address=multicast://224.5.6.7:1234 +dubbo.registry.address=multicast://224.5.6.7:1234 #dubbo.registry.address=zookeeper://127.0.0.1:2181 -dubbo.registry.address=dubbo://127.0.0.1:9090 +#dubbo.registry.address=dubbo://127.0.0.1:9090 dubbo.protocol.port=7070 dubbo.jetty.port=8080 dubbo.jetty.pages=index,services,providers,consumers,statistics,charts,status,log,system -- GitLab