blogspam: Log spam info on failure.

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index cc6e840f0ec6c8aa31f15e80312c472165a82165..8462a6d1d0bb9b730e74d6684a633217654cd02b 100644 (file)
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -83,7 +83,7 @@ sub checkcontent (@) {
        # and "buy".
        push @options, "exclude=stopwords";
 
        # and "buy".
        push @options, "exclude=stopwords";
 

-       my $res = $client->send_request('testComment', {
+       my %req={

                ip => $ENV{REMOTE_ADDR},
                comment => $params{content},
                subject => defined $params{subject} ? $params{subject} : "",
                ip => $ENV{REMOTE_ADDR},
                comment => $params{content},
                subject => defined $params{subject} ? $params{subject} : "",


@@ -92,17 +92,20 @@ sub checkcontent (@) {
                options => join(",", @options),
                site => $config{url},
                version => "ikiwiki ".$IkiWiki::version,
                options => join(",", @options),
                site => $config{url},
                version => "ikiwiki ".$IkiWiki::version,

-       });
+       };
+       my $res = $client->send_request('testComment', %req);

 
        if (! ref $res || ! defined $res->value) {
                debug("failed to get response from blogspam server ($url)");
                return undef;
        }
        elsif ($res->value =~ /^SPAM:(.*)/) {
 
        if (! ref $res || ! defined $res->value) {
                debug("failed to get response from blogspam server ($url)");
                return undef;
        }
        elsif ($res->value =~ /^SPAM:(.*)/) {

+               eval q{use Data::Dumper};
+               debug("blogspam server reports ".$res->value.": ".Dumper(\%req));

                return gettext("Sorry, but that looks like spam to <a href=\"http://blogspam.net/\">blogspam</a>: ").$1;
        }
        elsif ($res->value ne 'OK') {
                return gettext("Sorry, but that looks like spam to <a href=\"http://blogspam.net/\">blogspam</a>: ").$1;
        }
        elsif ($res->value ne 'OK') {

-               debug(gettext("blogspam server failure: ").$res->value);
+               debug("blogspam server failure: ".$res->value);

                return undef;
        }
        else {
                return undef;
        }
        else {

diff --git a/debian/changelog b/debian/changelog
index 6e8a54d9d52213bb0c3171da4ae484b4572d3141..8bf45c30ab7c2cc7eb4acf061d3dd318b891f7cc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.03) UNRELEASED; urgency=low
 
   * Avoid feeding decoded unicode to Term::ReadLine.
     Closes: 512169
 
   * Avoid feeding decoded unicode to Term::ReadLine.
     Closes: 512169

+  * blogspam: Log spam info on failure.

 
  -- Joey Hess <joeyh@debian.org>  Sun, 18 Jan 2009 14:50:57 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 18 Jan 2009 14:50:57 -0500