index efc356f2fff8ccfec49ed25137abfc839bcc50cb..1edcfc6152b32baac895ba795f41a51553a373ec 100644 (file)
#!/usr/bin/perl
#!/usr/bin/perl
-# $Id: Collectd.pm 7 2006-12-07 06:13:12Z formorer $
=head1 NAME
=head1 NAME
=over 4
=over 4
-=item collectd_socket [ socket path ] (default: /tmp/.collectd-email)
+=item collectd_socket [ socket path ] (default: /var/run/collectd-email)
Where the collectd socket is
Where the collectd socket is
config.
=cut
config.
=cut
+
+=item collectd_timeout [ sec ] (default: 2)
+
+if sending data to to collectd takes too long the connection will be aborted.
+
+=cut
+
+=item collectd_retries [ tries ] (default: 3)
+
+the collectd plugin uses a tread pool, if this is empty the connection fails,
+the SA Plugin then tries to reconnect. With this variable you can indicate how
+often it should try.
+
+=cut
+
=head1 DESCRIPTION
This modules uses the email plugin of collectd from Sebastian Harl to
=head1 DESCRIPTION
This modules uses the email plugin of collectd from Sebastian Harl to
use strict;
use bytes;
use warnings;
use strict;
use bytes;
use warnings;
+use Time::HiRes qw(usleep);
use IO::Socket;
use vars qw(@ISA);
use IO::Socket;
use vars qw(@ISA);
push (@cmds, {
setting => 'collectd_socket',
push (@cmds, {
setting => 'collectd_socket',
- default => '/tmp/.collectd-email',
+ default => '/var/run/collectd-email',
type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
});
type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRING,
});
$Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
});
$Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
});
+ push (@cmds, {
+ setting => 'collectd_retries',
+ default => 3,
+ type =>
+ $Mail::SpamAssassin::Conf::CONF_TYPE_NUMERIC,
+ });
+
+
$conf->{parser}->register_commands(\@cmds);
}
$conf->{parser}->register_commands(\@cmds);
}
my $message_status = $params->{permsgstatus};
#create new connection to our socket
eval {
my $message_status = $params->{permsgstatus};
#create new connection to our socket
eval {
- local $SIG{ALRM} = sub { die "alarm\n" }; # NB: \n required
+ local $SIG{ALRM} = sub { die "Sending to collectd timed out.\n" }; # NB: \n required
#generate a timeout
alarm $self->{main}->{conf}->{collectd_timeout};
#generate a timeout
alarm $self->{main}->{conf}->{collectd_timeout};
- my $sock = new IO::Socket::UNIX ( $self->{main}->{conf}->{collectd_socket});
- # debug some informations if collectd is not running or anything else went
- # wrong
- if ( ! $sock ) {
- dbg("collect: could not connect to " .
- $self->{main}->{conf}->{collectd_socket} . ": $! - collectd plugin
- disabled");
- return 0;
+ my $sock;
+ #try at least $self->{main}->{conf}->{collectd_retries} to get a
+ #connection
+ for (my $i = 0; $i < $self->{main}->{conf}->{collectd_retries} ; ++$i) {
+ last if $sock = new IO::Socket::UNIX
+ ($self->{main}->{conf}->{collectd_socket});
+ #sleep a random value between 0 and 50 microsecs to try for a new
+ #thread
+ usleep(int(rand(50)));
}
}
+
+ die("could not connect to " .
+ $self->{main}->{conf}->{collectd_socket} . ": $! - collectd plugin disabled") unless $sock;
+
$sock->autoflush(1);
my $score = $message_status->{score};
$sock->autoflush(1);
my $score = $message_status->{score};
close($sock);
alarm 0;
};
close($sock);
alarm 0;
};
- if ($@ eq "alarm\n") {
- info("Connection to collectd timed out");
+ if ($@) {
+ my $message = $@;
+ chomp($message);
+ info("collectd: $message");
return -1;
}
}
return -1;
}
}