You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by th...@apache.org on 2006/02/05 13:05:05 UTC
svn commit: r375008 - in /lenya/zone/bin: mail.sh nightly-trunk.sh setenv.sh
updateZones.sh
Author: thorsten
Date: Sun Feb 5 04:05:04 2006
New Revision: 375008
URL: http://svn.apache.org/viewcvs?rev=375008&view=rev
Log:
Adding enhanced error handling through notification
Modified:
lenya/zone/bin/mail.sh
lenya/zone/bin/nightly-trunk.sh
lenya/zone/bin/setenv.sh
lenya/zone/bin/updateZones.sh
Modified: lenya/zone/bin/mail.sh
URL: http://svn.apache.org/viewcvs/lenya/zone/bin/mail.sh?rev=375008&r1=375007&r2=375008&view=diff
==============================================================================
--- lenya/zone/bin/mail.sh (original)
+++ lenya/zone/bin/mail.sh Sun Feb 5 04:05:04 2006
@@ -13,6 +13,8 @@
At lenya.zones.apache.org
$1
+$3
+
See logfile: $2
EOF
Modified: lenya/zone/bin/nightly-trunk.sh
URL: http://svn.apache.org/viewcvs/lenya/zone/bin/nightly-trunk.sh?rev=375008&r1=375007&r2=375008&view=diff
==============================================================================
--- lenya/zone/bin/nightly-trunk.sh (original)
+++ lenya/zone/bin/nightly-trunk.sh Sun Feb 5 04:05:04 2006
@@ -30,8 +30,10 @@
HELP
}
source /export/home/lenya/bin/setenv.sh
+source /export/home/lenya/bin/mail.sh
umask 0002
logfile=$DOC_ROOT/log/lenya.trunk.update.log
+weblog=$WEB_LOGS/zone.log
echo "Deploying lenya.branch" > $logfile
echo "starting date is " >> $logfile
date >> $logfile
@@ -57,10 +59,26 @@
echo >> $logfile
echo "#svn up" >> $logfile
svn up >> $logfile 2>&1
+ echo "statusUpdate=$statusUpdate" >> $logfile
+ statusUpdate=$?
+ if [ ! $statusUpdate ]; then
+ sendMsg "[lenya.trunk.update] cocoon svn update failed" $weblog "Please resolve possible conflicts by hand logging into the zone server and looking at /export/home/lenya/src/cocoon-2.1.x"
+ exit 1
+ fi
fi
echo "#building" >> $logfile
./build.sh clean >> $logfile 2>&1
+ status=$?
+ if [ ! $status ]; then
+ sendMsg "[lenya.trunk.update] cocoon build clean failed" $weblog "Please resolve possible conflicts by hand logging into the zone server and looking at /export/home/lenya/src/cocoon-2.1.x"
+ exit 1
+ fi
./build.sh >> $logfile 2>&1
+ status=$?
+ if [ ! $status ]; then
+ sendMsg "[lenya.trunk.update] cocoon build failed" $weblog "Please resolve possible conflicts by hand logging into the zone server and looking at /export/home/lenya/src/cocoon-2.1.x"
+ exit 1
+ fi
fi
#update trunk & restart
@@ -70,6 +88,11 @@
if [ $update = true ]; then
echo "#svn up" >> $logfile
svn up >> $logfile 2>&1
+ statusUpdate=$?
+ if [ ! $statusUpdate ]; then
+ sendMsg "[lenya.trunk.update] lenya-trunk svn update failed" $weblog "Please resolve possible conflicts by hand logging into the zone server and looking at /export/home/lenya/src/lenya-trunk"
+ exit 1
+ fi
fi
#first, kill running lenya instance
echo >> $logfile
@@ -79,8 +102,18 @@
rm /export/home/lenya/bin/lenya-trunk.pid >> $logfile
echo "#building clean" >> $logfile 2>&1
./build.sh clean >> $logfile 2>&1
+ status=$?
+ if [ ! $status ]; then
+ sendMsg "[lenya.trunk.update] lenya-trunk build clean failed" $weblog "Please resolve possible conflicts by hand logging into the zone server and looking at /export/home/lenya/src/lenya-trunk"
+ exit 1
+ fi
echo "#building" >> $logfile 2>&1
./build.sh >> $logfile 2>&1
+ status=$?
+ if [ ! $status ]; then
+ sendMsg "[lenya.trunk.update] lenya-trunk build failed" $weblog "Please resolve possible conflicts by hand logging into the zone server and looking at /export/home/lenya/src/lenya-trunk"
+ exit 1
+ fi
echo "#starting" >> $logfile 2>&1
./lenya.sh servlet >> $logfile 2>&1 &
echo $! > /export/home/lenya/bin/lenya-trunk.pid
Modified: lenya/zone/bin/setenv.sh
URL: http://svn.apache.org/viewcvs/lenya/zone/bin/setenv.sh?rev=375008&r1=375007&r2=375008&view=diff
==============================================================================
--- lenya/zone/bin/setenv.sh (original)
+++ lenya/zone/bin/setenv.sh Sun Feb 5 04:05:04 2006
@@ -21,5 +21,7 @@
DOC_ROOT=$DOC_ROOT_SRC/build/site
export DOC_ROOT
+export WEB_LOGS=http://lenya.zones.apache.org/log
+
PATH=$JAVA_HOME/bin:$FORREST_HOME/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin:/opt/subversion-1.1.4/bin:~/bin
export PATH
Modified: lenya/zone/bin/updateZones.sh
URL: http://svn.apache.org/viewcvs/lenya/zone/bin/updateZones.sh?rev=375008&r1=375007&r2=375008&view=diff
==============================================================================
--- lenya/zone/bin/updateZones.sh (original)
+++ lenya/zone/bin/updateZones.sh Sun Feb 5 04:05:04 2006
@@ -2,6 +2,7 @@
source /export/home/lenya/bin/setenv.sh
umask 0002
logfile=$DOC_ROOT/log/zone.log
+weblog=$WEB_LOGS/zone.log
echo "zone docu src at " $DOC_ROOT_SRC> $logfile
echo "starting date is " >> $logfile
date >> $logfile
@@ -9,6 +10,12 @@
echo >> $logfile
echo "Do svn update ..." >> $logfile
svn up >> $logfile 2>&1
+statusUpdate=$?
+echo "statusUpdate=$statusUpdate" >> $logfile
+if [ ! $statusUpdate ]; then
+ sendMsg "svn update for zones website failed" $weblog
+ exit 1
+fi
echo >> $logfile
echo "...invoke forrestbot ..." >> $logfile
forrest -Dforrest.jvmargs=-Djava.awt.headless=true -f $DOC_ROOT_SRC/publish-zone.xml >> $logfile 2>&1
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org