You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2020/07/12 10:18:32 UTC

svn commit: r1879806 - in /spamassassin: branches/3.4/lib/Mail/SpamAssassin/Plugin/Pyzor.pm trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm

Author: hege
Date: Sun Jul 12 10:18:32 2020
New Revision: 1879806

URL: http://svn.apache.org/viewvc?rev=1879806&view=rev
Log:
Bug 7817 - Pyzor.pm - Show traceback in log

Modified:
    spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Pyzor.pm?rev=1879806&r1=1879805&r2=1879806&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Pyzor.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Pyzor.pm Sun Jul 12 10:18:32 2020
@@ -303,10 +303,12 @@ sub pyzor_lookup {
       return;
     }
     chomp for @response;
-    dbg("pyzor: got response: " . join("\\n", @response));
 
     if ($response[0] =~ /^Traceback/) {
-      warn("internal error, python traceback seen in response\n");
+      warn("internal error, python traceback seen in response: ".
+        join("\\n", @response));
+    } else {
+      dbg("pyzor: got response: ".join("\\n", @response));
     }
 
   });

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm?rev=1879806&r1=1879805&r2=1879806&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Pyzor.pm Sun Jul 12 10:18:32 2020
@@ -532,11 +532,11 @@ sub _check_result {
   my $count_wl = 0;
   foreach my $res (@$results) {
     chomp($res);
-    dbg("pyzor: got response: $res");
     if ($res =~ /^Traceback/) {
-      info("pyzor: internal error, python traceback seen in response");
+      info("pyzor: internal error, python traceback seen in response: $res");
       return 0;
     }
+    dbg("pyzor: got response: $res");
     # this regexp is intended to be a little bit forgiving
     if ($res =~ /^\S+\t.*?\t(\d+)\t(\d+)\s*$/) {
       # until pyzor servers can sync their DBs,