svn commit: r573989 - in /spamassassin/trunk/build/automc: buildbot_ready post_mc_proc_logs

[jm...@apache.org]

Author: jm
Date: Sun Sep  9 03:55:04 2007
New Revision: 573989

URL: http://svn.apache.org/viewvc?rev=573989&view=rev
Log:
split out part of the post-bbmass-mass-check process since we'll be distributing it across two hosts

Added:
    spamassassin/trunk/build/automc/post_mc_proc_logs   (with props)
Modified:
    spamassassin/trunk/build/automc/buildbot_ready

Modified: spamassassin/trunk/build/automc/buildbot_ready
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/buildbot_ready?rev=573989&r1=573988&r2=573989&view=diff
==============================================================================
--- spamassassin/trunk/build/automc/buildbot_ready (original)
+++ spamassassin/trunk/build/automc/buildbot_ready Sun Sep  9 03:55:04 2007
@@ -136,20 +136,10 @@
   run ("mv ham.log $logdir/ham-$slave.log");
   run ("mv spam.log $logdir/spam-$slave.log");
 
-  # ensure those log files are readable by the freqsd, and writable
-  # by "automc" so they can be deleted later
-  run ("chmod 775 $logdir");
-  run ("chmod 664 $logdir/ham-$slave.log $logdir/spam-$slave.log");
+  # my $hname = `uname -n`;
 
-  # run our fast report generator
-  $ENV{HOME} = $BBMHOME;
-  umask(002);
-
-  run ("$REPORTSCRIPTSADIR/masses/rule-qa/corpus-hourly --dir $logdir --tag b");
-  run ("$REPORTSCRIPTSADIR/masses/rule-qa/automc/gen_info_xml");
-
-  # enqueue a request for the slow stuff with the report-generation daemon
-  run ("$REPORTSCRIPTSADIR/build/automc/freqsd --enq $logdir");
+  # run our script to process those logs
+  run ("$REPORTSCRIPTSADIR/build/automc/post_mc_proc_logs $logdir $slave");
 }
 
 # ---------------------------------------------------------------------------

Added: spamassassin/trunk/build/automc/post_mc_proc_logs
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/automc/post_mc_proc_logs?rev=573989&view=auto
==============================================================================
--- spamassassin/trunk/build/automc/post_mc_proc_logs (added)
+++ spamassassin/trunk/build/automc/post_mc_proc_logs Sun Sep  9 03:55:04 2007
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+logdir="$1"
+slave="$2"
+
+HOME=/export/home/bbmass
+REPORTSCRIPTSADIR=/export/home/automc/svn/spamassassin
+
+# ensure all files are readable for freqsd (uid=automc)
+chmod 755 $logdir
+chmod 644 $logdir/ham-$slave.log $logdir/spam-$slave.log
+
+export HOME
+umask 002
+
+# run fast report generation right now
+$REPORTSCRIPTSADIR/masses/rule-qa/corpus-hourly --dir $logdir --tag b
+$REPORTSCRIPTSADIR/masses/rule-qa/automc/gen_info_xml
+
+# enqueue a request for the slow stuff with the report-generation daemon
+$REPORTSCRIPTSADIR/build/automc/freqsd --enq $logdir

Propchange: spamassassin/trunk/build/automc/post_mc_proc_logs
------------------------------------------------------------------------------
    svn:executable = *