svn commit: r1488251 - in /spamassassin/trunk: masses/mass-check spamd/spamd.raw

[mm...@apache.org]

Author: mmartinec
Date: Fri May 31 14:32:37 2013
New Revision: 1488251

URL: http://svn.apache.org/r1488251
Log:
Bug 6942: Redis bayes storage module fixes and updates (part 2)

Modified:
    spamassassin/trunk/masses/mass-check
    spamassassin/trunk/spamd/spamd.raw

Modified: spamassassin/trunk/masses/mass-check
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/mass-check?rev=1488251&r1=1488250&r2=1488251&view=diff
==============================================================================
--- spamassassin/trunk/masses/mass-check (original)
+++ spamassassin/trunk/masses/mass-check Fri May 31 14:32:37 2013
@@ -338,6 +338,7 @@ my $spamtest = create_spamtest();
 $spamtest->compile_now(0);      # 0 since we will be reading more configs
 $spamtest->read_scoreonly_config("$FindBin::Bin/mass-check.cf");
 $spamtest->read_scoreonly_config($user_prefs);
+$spamtest->call_plugins("prefork_init");  # since SA 3.4.0
 
 my $who = `id -un 2>/dev/null`;
 my $where = `uname -n 2>/dev/null`;

Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?rev=1488251&r1=1488250&r2=1488251&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Fri May 31 14:32:37 2013
@@ -1179,6 +1179,13 @@ if (defined $opt{'pidfile'}) {
   }
 }
 
+# The "prefork_init" plugin callback is called in the parent process shortly
+# before forking off child processes. It allows plugins which were activated
+# by the master spamd process to prepare for a fork, e.g. by closing or
+# dropping some resources which won't be of any use by a child process.
+#
+$spamtest->call_plugins("prefork_init");  # since SA 3.4.0
+
 # now allow waiting processes to connect, if they're watching the log.
 # The test suite does this!
 info("spamd: server pid: $$");