[project @ 2004-01-14 19:41:18 by cjwatson]

Lock incoming-spamscan before creating an instance of SpamAssassin.

diff --git a/scripts/spamscan.in b/scripts/spamscan.in
index 9db043169af0ea0f1e3eb860fa5b7b9e5481df90..29d46bbfca86986751c0f5b87ec4d9e11fc2620a 100755 (executable)
--- 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";