commit f280640383122a33088db7a1e82439bf578c2d4c
author yoshi <yoshi@onlab.us> Thu Jan 23 09:28:39 2014 -0800
committer yoshi <yoshi@onlab.us> Thu Jan 23 09:28:39 2014 -0800
tree 2d595d551dd5d0908190c5deb4c93c7fbeacb708
parent 2c06b02147b28345b0b85d7301be1b401ebca32a

Modified start ramcloud script

conf/ramcloud.conf

diff --git a/conf/ramcloud.conf b/conf/ramcloud.conf
index ef6881b..b69fcd2 100644
--- a/conf/ramcloud.conf
+++ b/conf/ramcloud.conf
@@ -1,2 +1,4 @@
 ramcloud.coordinatorIp=fast+udp:host=192.168.56.11
 ramcloud.coordinatorPort=port=12246
+ramcloud.serverIp=fast+udp:host=192.168.56.11
+ramcloud.serverPort=port=12242

start-ramcloud-coordinator.sh

diff --git a/start-ramcloud-coordinator.sh b/start-ramcloud-coordinator.sh
index bba962a..6a4232e 100755
--- a/start-ramcloud-coordinator.sh
+++ b/start-ramcloud-coordinator.sh
@@ -2,19 +2,14 @@
 
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${HOME}/ramcloud/bindings/java/edu/stanford/ramcloud:${HOME}/ramcloud/obj.blueprint-java
 
-function host2ip (){
-   ip=`egrep "$1\$" /etc/hosts |grep -v "ip6"|  awk '{print $1}'`
-   echo $ip
-}
-
 # Set paths
 ONOS_HOME=`dirname $0`
 RAMCLOUD_DIR=${HOME}/ramcloud
 LOGDIR=${ONOS_HOME}/onos-logs
-RAMCLOUD_LOG=${LOGDIR}/ramcloudcoordinator.`hostname`.log
-thishost=`hostname`
-thisip=`host2ip $thishost`
-RAMCLOUD_COORDINATOR="fast+udp:host=$thisip,port=12242"
+RAMCLOUD_LOG=${LOGDIR}/ramcloud.coordinator.`hostname`.log
+coordinatorip=`grep coordinatorIp ${ONOS_HOME}/conf/ramcloud.conf | cut -d "=" -f 2,3`
+coordinatorport=`grep coordinatorPort ${ONOS_HOME}/conf/ramcloud.conf | cut -d "=" -f 2,3`
+RAMCLOUD_COORDINATOR=`echo $coordinatorip","$coordinatorport`
 
 function lotate {
     logfile=$1

start-ramcloud-server.sh

diff --git a/start-ramcloud-server.sh b/start-ramcloud-server.sh
index bdc73e2..a644837 100755
--- a/start-ramcloud-server.sh
+++ b/start-ramcloud-server.sh
@@ -3,23 +3,17 @@
 ulimit -c unlimited
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${HOME}/ramcloud/bindings/java/edu/stanford/ramcloud:${HOME}/ramcloud/obj.blueprint-java
 
-function host2ip (){
-   ip=`egrep "$1\$" /etc/hosts |grep -v "ip6"|  awk '{print $1}'`
-   echo $ip
-}
-
 # Set paths
 ONOS_HOME=`dirname $0`
 RAMCLOUD_DIR=${HOME}/ramcloud
 LOGDIR=${ONOS_HOME}/onos-logs
-RAMCLOUD_LOG=${LOGDIR}/ramcloud.`hostname`.log
-thishost=`hostname`
-thisip=`host2ip $thishost`
+RAMCLOUD_LOG=${LOGDIR}/ramcloud.server.`hostname`.log
 coordinatorip=`grep coordinatorIp ${ONOS_HOME}/conf/ramcloud.conf | cut -d "=" -f 2,3`
 coordinatorport=`grep coordinatorPort ${ONOS_HOME}/conf/ramcloud.conf | cut -d "=" -f 2,3`
-coordinator=`echo $coordinatorip","$coordinatorport`
-RAMCLOUD_COORDINATOR=$coordinator
-RAMCLOUD_SERVER="fast+udp:host=$thisip,port=12242"
+RAMCLOUD_COORDINATOR=`echo $coordinatorip","$coordinatorport`
+serverip=`grep serverIp ${ONOS_HOME}/conf/ramcloud.conf | cut -d "=" -f 2,3`
+serverport=`grep serverPort ${ONOS_HOME}/conf/ramcloud.conf | cut -d "=" -f 2,3`
+RAMCLOUD_SERVER=`echo $serverip","$serverport`
 
 function lotate {
     logfile=$1