Fix default user for usertags

[debbugs.git] / scripts / spamscan-sa

diff --git a/scripts/spamscan-sa b/scripts/spamscan-sa
index 4b57ddd99ba990e4ddfc1f5c279f915b79c4eba2..26c41729ad1ce7c6e37f985b0bf5eb92eb9638e2 100755 (executable)
--- a/scripts/spamscan-sa
+++ b/scripts/spamscan-sa
@@ -7,10 +7,11 @@
 use warnings;
 use strict;
 
-use lib qw(/usr/lib/debbugs);
+use lib qw(/srv/bugs.debian.org/scripts/);
 
 use Mail::CrossAssassin;
 use Mail::SpamAssassin;
+use Mail::SpamAssassin::Logger;
 
 use Debbugs::Config qw(:config);
 # New versions of debbugs will not allow use in /etc/debbugs/config
@@ -35,12 +36,17 @@ sub header_or_empty ($$) {
 }
 
 my $spam = Mail::SpamAssassin->new({
-        dont_copy_prefs => 1,
-        site_rules_filename => $config{spam_rules_dir},
-        userprefs_filename => $config{spam_user_prefs},
+        #dont_copy_prefs => 1,
+#      debug => 'all',
+        #site_rules_filename => $config{spam_rules_dir},
+        #userprefs_filename => $config{spam_user_prefs},
                local_tests_only => ($config{spam_local_tests_only} || 0),
                debug => ($ENV{DEBBUGS_SPAM_DEBUG} || 0),
 });
+#Mail::SpamAssassin::Logger::add(method => 'file',filename => "/home/debbugs/.spamassassin/debuglog_".time."_$$");
+# wait longer for a lock
+$spam->init_learner({wait_for_lock => 1});
+
 $spam->compile_now(1); # use all user preferences
 
 while (my $id = <STDIN>) {