geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r702565 - in /geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources: all.sh cycleservers.sh hostname servers.sh
Date Tue, 07 Oct 2008 17:58:43 GMT
Author: dblevins
Date: Tue Oct  7 10:58:42 2008
New Revision: 702565

URL: http://svn.apache.org/viewvc?rev=702565&view=rev
Log:
Specify the ServerHostname as a startup flag

Added:
    geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/hostname
Modified:
    geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/all.sh
    geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/cycleservers.sh
    geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/servers.sh

Modified: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/all.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/all.sh?rev=702565&r1=702564&r2=702565&view=diff
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/all.sh (original)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/all.sh Tue Oct  7 10:58:42
2008
@@ -3,8 +3,10 @@
 echo unpack controller server
 tar xzf geronimo-tomcat-farm-controller-2.2-SNAPSHOT-bin.tar.gz
 
+host=$(cat hostname)
+
 echo start controller server in background
-./geronimo-tomcat-farm-controller-2.2-SNAPSHOT/bin/gsh geronimo/start-server >controller.log
&
+./geronimo-tomcat-farm-controller-2.2-SNAPSHOT/bin/gsh geronimo/start-server -G config.substitution.ServerHostname=$host
>controller.log &
 
 echo wait 20 seconds for controller to start
 sleep 20
@@ -19,6 +21,10 @@
 echo deploy the app, distribute it to the farm
 ./geronimo-tomcat-farm-controller-2.2-SNAPSHOT/bin/gsh<deploy.gsh
 
+# gshell (jline) seems to leave the terminal in a strage state
+# so reset it
+reset &> /dev/null
+
 echo start grinder
 ./grinder-3.0.1/bin/console &
 

Modified: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/cycleservers.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/cycleservers.sh?rev=702565&r1=702564&r2=702565&view=diff
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/cycleservers.sh (original)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/cycleservers.sh Tue
Oct  7 10:58:42 2008
@@ -1,9 +1,11 @@
 #!/bin/bash
 
+host=$(cat hostname)
+
 # Split out as a separate function to avoid output like:
 # "./cycleservers.sh: line 3:  8472 Killed                  ./bin/gsh geronimo/start-server
...."
 function start (){
-    ./bin/gsh geronimo/start-server -s ${server} -G config.substitution.PortOffset=${s}0
&> ${s}.log 
+    ./bin/gsh geronimo/start-server -s ${server} -G config.substitution.ServerHostname=$host
-G config.substitution.PortOffset=${s}0 &> ${s}.log 
 }
 
 (cd geronimo-plugin-farm-node-2.2-SNAPSHOT

Added: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/hostname
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/hostname?rev=702565&view=auto
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/hostname (added)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/hostname Tue Oct  7
10:58:42 2008
@@ -0,0 +1 @@
+192.168.15.111
\ No newline at end of file

Modified: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/servers.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/servers.sh?rev=702565&r1=702564&r2=702565&view=diff
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/servers.sh (original)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/servers.sh Tue Oct 
7 10:58:42 2008
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+host=$(cat hostname)
+
 BASE=geronimo-plugin-farm-node-2.2-SNAPSHOT
 if  [ "$1" = "stop" ] ; then
 (
@@ -32,7 +34,7 @@
   mkdir ${sn}
   cp -r var ${sn}/
   if  [ "$1" = "start" ] ; then
-    ./bin/gsh geronimo/start-server -s ${sn} -G config.substitution.PortOffset=${s}0 >${s}.log
&
+    ./bin/gsh geronimo/start-server -s ${sn} -G config.substitution.ServerHostname=$host
-G config.substitution.PortOffset=${s}0 >${s}.log &
   fi
 done
 )



Mime
View raw message