From ffeb920c780d83886a65ba8fc0f3d6faafe7a2a7 Mon Sep 17 00:00:00 2001 From: cjwatson <> Date: Wed, 14 Jan 2004 19:41:18 -0800 Subject: [PATCH] [project @ 2004-01-14 19:41:18 by cjwatson] Lock incoming-spamscan before creating an instance of SpamAssassin. --- scripts/spamscan.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/spamscan.in b/scripts/spamscan.in index 9db04316..29d46bbf 100755 --- a/scripts/spamscan.in +++ b/scripts/spamscan.in @@ -1,5 +1,5 @@ #! /usr/bin/perl -T -# $Id: spamscan.in,v 1.6 2004/01/14 01:39:01 cjwatson Exp $ +# $Id: spamscan.in,v 1.7 2004/01/14 19:41:18 cjwatson Exp $ # # Usage: spamscan # @@ -28,6 +28,11 @@ use Mail::SpamAssassin::NoMailAudit; umask 002; +eval { + &filelock('incoming-spamscan'); +}; +exit if $@; + my $user_prefs = "$ENV{HOME}/.spamassassin/user_prefs"; my $user_prefs_time; if (-e $user_prefs) { @@ -58,11 +63,6 @@ sub header_or_empty ($$) { return ''; } -eval { - &filelock('incoming-spamscan'); -}; -exit if $@; - for (;;) { if (-f 'spamscan-stop') { print "spamscan-stop file created\n"; -- 2.39.5