svn commit: r692417 - in /spamassassin/trunk/masses/rule-qa: nightly-slave-start nightly-slave-stop

[jm...@apache.org]

Author: jm
Date: Fri Sep  5 05:07:55 2008
New Revision: 692417

URL: http://svn.apache.org/viewvc?rev=692417&view=rev
Log:
more Solaris porting, this time so that spamassassin2.zones.apache.org will be able to act as a nightly mass-check slave in place of the decommissioned vmsa.apache.org

Modified:
    spamassassin/trunk/masses/rule-qa/nightly-slave-start
    spamassassin/trunk/masses/rule-qa/nightly-slave-stop

Modified: spamassassin/trunk/masses/rule-qa/nightly-slave-start
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/nightly-slave-start?rev=692417&r1=692416&r2=692417&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/nightly-slave-start (original)
+++ spamassassin/trunk/masses/rule-qa/nightly-slave-start Fri Sep  5 05:07:55 2008
@@ -23,11 +23,14 @@
 
 # a rather rough-and-ready way to ensure any hangover mass-checks
 # from the previous set are killed, before we start these ones;
-# ||true ensures we carry on even if this fails
-ssh $host \
-    killall perl || true
+# ||true ensures we carry on even if this fails.  ". envs" allows
+# host-specific aliases/paths to workaround platform issues
+ssh $host . envs \; \
+    pkill -15 -f perl || true
+ssh $host . envs \; \
+    pkill -9 -f perl || true
 
-ssh $host \
+ssh $host . envs \; \
     rm -rf $clienttree/code \; \
     mkdir -p $clienttree/code \; \
     cd $clienttree/code \; \
@@ -40,8 +43,7 @@
 
 # rebuild to compile the blib modules for this platform.
 
-ssh $host \
-    . envs \; \
+ssh $host . envs \; \
     cd $clienttree/code \; \
     perl Makefile.PL \; \
     make clean \; \
@@ -50,8 +52,7 @@
 
 # use a cs_cache in $clienttree/cs_cache -- this is not removed
 # with the above "rm -rf" command
-ssh -f $host \
-    . envs \; \
+ssh $host . envs \; \
     cd $clienttree/code/masses \; \
     TZ=UTC perl mass-check \
         --cs_ssl --cs_verbose --cs_schedule_cache --cs_cachedir=../../cs_cache \

Modified: spamassassin/trunk/masses/rule-qa/nightly-slave-stop
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/rule-qa/nightly-slave-stop?rev=692417&r1=692416&r2=692417&view=diff
==============================================================================
--- spamassassin/trunk/masses/rule-qa/nightly-slave-stop (original)
+++ spamassassin/trunk/masses/rule-qa/nightly-slave-stop Fri Sep  5 05:07:55 2008
@@ -9,9 +9,9 @@
 set -x
 
 # a rather rough-and-ready way to ensure any hangover mass-checks
-# from the previous set are killed, before we start these ones;
+# from the previous set are killed, before we start these ones
 ssh $host \
-    killall perl
+    pkill -15 -f perl
 
 # and clean out the client-side caches of old cached mail
 ssh $host \