Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-21 18:41:03 +00:00
Code Issues Releases Wiki Activity

loop over every socket/port to get the version and use it afterwards as cache

Browse source
This commit is contained in:
Younes Ichiche 2020-04-05 13:45:54 +02:00 • committed by Lars Kruse
parent 9534979768
commit 3886860089
4 changed files with 218 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

88
plugins/rtorrent/rtom_allsessions_mem
View file

@ -65,49 +65,70 @@ my @ports = split /,/, $ENV{"port"} || "";
# detect rtorrent version
use version;
my $rtorrent_version;
sub rtorrent_version_lower_than {
if (not length $rtorrent_version){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
} else {
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
my %rtorrent_version;
sub get_socket_version {
my $version;
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$version = $1;
}
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$rtorrent_version = $1;
}
}
close (SOCK);
}
return version->parse($rtorrent_version) < version->parse($_[0]);
close (SOCK);
$rtorrent_version{$_[0]} = $version;
}
sub rtorrent_version_lower_than {
if (keys %rtorrent_version == 0 && not defined $_[0]){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
for $socket (@sockets)
{
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
get_socket_version $port;
close (SOCK);
}
} else {
for $port (@ports)
{
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
get_socket_version $port;
close (SOCK);
}
}
}
if(defined $_[1]){
return version->parse($rtorrent_version{$_[0]}) < version->parse($_[1]);
}
}
# init rtorrent_version
rtorrent_version_lower_than();
my $mem = 0;
my $pattern = qr/<value><(int|i4|i8|ex\.i8)>(\d+)<\/(int|i4|i8|ex\.i8)><\/value>/;
my $function = rtorrent_version_lower_than('0.9.0') ? 'get_memory_usage' : 'pieces.memory.current';
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function</methodName></methodCall>";
my $llen = length $line;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
my $mem = 0;
sub construct_line {
my $function = rtorrent_version_lower_than($_[0], '0.9.0') ? 'get_memory_usage' : 'pieces.memory.current';
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function</methodName></methodCall>";
my $llen = length $line;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line = "${hlen}:${header},${line}";
return $line;
}
if ( ( defined $src ) && ( $src eq "socket" ) ) {
for $socket (@sockets)
{
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
my $line = "${hlen}:${header},${line}";
print SOCK $line;
print SOCK construct_line($socket);
flush SOCK;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
@ -121,8 +142,7 @@ if ( ( defined $src ) && ( $src eq "socket" ) ) {
{
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
my $line = "${hlen}:${header},${line}";
print SOCK $line;
print SOCK construct_line($port);
flush SOCK;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {

91
plugins/rtorrent/rtom_allsessions_peers
View file

@ -75,44 +75,64 @@ my @ports = split /,/, $ENV{"port"} || "";
# detect rtorrent version
use version;
my $rtorrent_version;
sub rtorrent_version_lower_than {
if (not length $rtorrent_version){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
} else {
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
my %rtorrent_version;
sub get_socket_version {
my $version;
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$version = $1;
}
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$rtorrent_version = $1;
}
}
close (SOCK);
}
return version->parse($rtorrent_version) < version->parse($_[0]);
close (SOCK);
$rtorrent_version{$_[0]} = $version;
}
sub rtorrent_version_lower_than {
if (keys %rtorrent_version == 0 && not defined $_[0]){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
for $socket (@sockets)
{
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
get_socket_version $port;
close (SOCK);
}
} else {
for $port (@ports)
{
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
get_socket_version $port;
close (SOCK);
}
}
}
if(defined $_[1]){
return version->parse($rtorrent_version{$_[0]}) < version->parse($_[1]);
}
}
# init rtorrent_version
rtorrent_version_lower_than();
my $pattern = qr/<value><(int|i4|i8|ex\.i8)>(\d+)<\/(int|i4|i8|ex\.i8)><\/value>/;
my $tpattern = qr/[0-9A-F]{20}/;
my $function_multicall = rtorrent_version_lower_than('0.9.0') ? 'd.multicall' : 'd.multicall2';
my $function_hash = rtorrent_version_lower_than('0.9.0') ? 'd.get_hash=' : 'd.hash=';
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function_multicall</methodName><params><param><value><string>main</string></value></param><param><value><string>$function_hash</string></value></param><param><value><string>p.multicall=,p.is_encrypted=,p.is_incoming=</string></value></param></params></methodCall>";
my $llen = length $line;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
sub construct_line {
my $function_multicall = rtorrent_version_lower_than($_[0], '0.9.0') ? 'd.multicall' : 'd.multicall2';
my $function_hash = rtorrent_version_lower_than($_[0], '0.9.0') ? 'd.get_hash=' : 'd.hash=';
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function_multicall</methodName><params><param><value><string>main</string></value></param><param><value><string>$function_hash</string></value></param><param><value><string>p.multicall=,p.is_encrypted=,p.is_incoming=</string></value></param></params></methodCall>";
my $llen = length $line;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line = "${hlen}:${header},${line}";
return $line;
}
my $tor = 0;
my $tot = 0;
@ -123,14 +143,12 @@ my $ppline = "";
my $out = 0;
my $pla = 0;
if ( ( defined $src ) && ( $src eq "socket" ) ) {
for $socket (@sockets)
{
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
my $line = "${hlen}:${header},${line}";
print SOCK $line;
print SOCK construct_line($socket);
flush SOCK;
while ( $line = <SOCK> ) {
if ( $line =~ /$tpattern/ ) {
@ -154,8 +172,7 @@ if ( ( defined $src ) && ( $src eq "socket" ) ) {
{
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
my $line = "${hlen}:${header},${line}";
print SOCK $line;
print SOCK construct_line($port);
flush SOCK;
while ( $line = <SOCK> ) {
if ( $line =~ /$tpattern/ ) {

95
plugins/rtorrent/rtom_allsessions_spdd
View file

@ -89,43 +89,66 @@ my @ports = split /,/, $ENV{"port"} || "";
# detect rtorrent version
use version;
my $rtorrent_version;
sub rtorrent_version_lower_than {
if (not length $rtorrent_version){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
} else {
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
my %rtorrent_version;
sub get_socket_version {
my $version;
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$version = $1;
}
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$rtorrent_version = $1;
}
}
close (SOCK);
}
return version->parse($rtorrent_version) < version->parse($_[0]);
close (SOCK);
$rtorrent_version{$_[0]} = $version;
}
my $pattern = qr/<value><(int|i4|i8|ex\.i8)>([-]{0,1}\d+)<\/(int|i4|i8|ex\.i8)><\/value>/;
my $function_totalup = rtorrent_version_lower_than('0.9.0') ? 'get_up_total' : 'throttle.global_up.total';
my $function_totaldown = rtorrent_version_lower_than('0.9.0') ? 'get_down_total' : 'throttle.global_down.total';
my $function_rateup = rtorrent_version_lower_than('0.9.0') ? 'get_upload_rate' : 'throttle.global_up.max_rate';
my $function_ratedown = rtorrent_version_lower_than('0.9.0') ? 'get_download_rate' : 'throttle.global_down.max_rate';
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.multicall</methodName><params><param><value><array><data><value><struct><member><name>methodName</name><value><string>$function_totalup</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_totaldown</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_rateup</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_ratedown</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value></data></array></value></param></params></methodCall>";
sub rtorrent_version_lower_than {
if (keys %rtorrent_version == 0 && not defined $_[0]){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
for $socket (@sockets)
{
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
get_socket_version $port;
close (SOCK);
}
} else {
for $port (@ports)
{
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
get_socket_version $port;
close (SOCK);
}
}
}
if(defined $_[1]){
return version->parse($rtorrent_version{$_[0]}) < version->parse($_[1]);
}
}
# init rtorrent_version
rtorrent_version_lower_than();
my $llen = length $line;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
my $pattern = qr/<value><(int|i4|i8|ex\.i8)>([-]{0,1}\d+)<\/(int|i4|i8|ex\.i8)><\/value>/;
sub construct_line {
my $function_totalup = rtorrent_version_lower_than($_[0], '0.9.0') ? 'get_up_total' : 'throttle.global_up.total';
my $function_totaldown = rtorrent_version_lower_than($_[0], '0.9.0') ? 'get_down_total' : 'throttle.global_down.total';
my $function_rateup = rtorrent_version_lower_than($_[0], '0.9.0') ? 'get_upload_rate' : 'throttle.global_up.max_rate';
my $function_ratedown = rtorrent_version_lower_than($_[0], '0.9.0') ? 'get_download_rate' : 'throttle.global_down.max_rate';
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.multicall</methodName><params><param><value><array><data><value><struct><member><name>methodName</name><value><string>$function_totalup</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_totaldown</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_rateup</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value><value><struct><member><name>methodName</name><value><string>$function_ratedown</string></value></member><member><name>params</name><value><array><data/></array></value></member></struct></value></data></array></value></param></params></methodCall>";
my $llen = length $line;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line = "${hlen}:${header},${line}";
return $line;
}
my $up = -1;
my $down = -1;
@ -135,8 +158,7 @@ if ( ( defined $src ) && ( $src eq "socket" ) ) {
{
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
my $line = "${hlen}:${header},${line}";
print SOCK $line;
print SOCK construct_line($socket);
flush SOCK;
my $up_tmp = -1;
my $down_tmp = -1;
@ -159,8 +181,7 @@ if ( ( defined $src ) && ( $src eq "socket" ) ) {
{
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
my $line = "${hlen}:${header},${line}";
print SOCK $line;
print SOCK construct_line($port);
flush SOCK;
my $up_tmp = -1;
my $down_tmp = -1;

90
plugins/rtorrent/rtom_allsessions_vol
View file

@ -79,59 +79,74 @@ my @ports = split /,/, $ENV{"port"} || "";
# detect rtorrent version
use version;
my $rtorrent_version;
sub rtorrent_version_lower_than {
if (not length $rtorrent_version){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
} else {
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
my %rtorrent_version;
sub get_socket_version {
my $version;
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$version = $1;
}
my $line_version= "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>system.client_version</methodName></methodCall>";
my $llen = length $line_version;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line_version= "${hlen}:${header},${line_version}";
print SOCK $line_version;
flush SOCK;
my $pattern = qr/<value><string>([0-9.]+)<\/string><\/value>/;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
$rtorrent_version = $1;
}
}
close (SOCK);
}
if(defined $_[0]){
return version->parse($rtorrent_version) < version->parse($_[0]);
}
close (SOCK);
$rtorrent_version{$_[0]} = $version;
}
sub rtorrent_version_lower_than {
if (keys %rtorrent_version == 0 && not defined $_[0]){
if ( ( defined $src ) && ( $src eq "socket" ) ) {
for $socket (@sockets)
{
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
get_socket_version $port;
close (SOCK);
}
} else {
for $port (@ports)
{
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
get_socket_version $port;
close (SOCK);
}
}
}
if(defined $_[1]){
return version->parse($rtorrent_version{$_[0]}) < version->parse($_[1]);
}
}
# init rtorrent_version
rtorrent_version_lower_than();
my $pattern = qr/<value><string>([A-Z0-9]+)<\/string><\/value>/;
my $function_multicall;
my $function_hash;
sub construct_line {
my $function_multicall = rtorrent_version_lower_than($_[0], '0.9.0')? 'd.multicall' : 'd.multicall2';
my $function_hash = rtorrent_version_lower_than($_[0], '0.9.0')? 'd.get_hash=' : 'd.hash=';
my $line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function_multicall</methodName><params><param><value><string>${_}</string></value></param><param><value><string>$function_hash</string></value></param></params></methodCall>";
my $llen = length $line;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
$line = "${hlen}:${header},${line}";
return $line;
}
foreach ( @views ) {
my $num = 0;
$function_multicall = rtorrent_version_lower_than('0.9.0')? 'd.multicall' : 'd.multicall2';
$function_hash = rtorrent_version_lower_than('0.9.0')? 'd.get_hash=' : 'd.hash=';
$line = "<?xml version=\"1.0\" encoding=\"utf-8\"?><methodCall><methodName>$function_multicall</methodName><params><param><value><string>${_}</string></value></param><param><value><string>$function_hash</string></value></param></params></methodCall>";
my $llen = length $line;
my $header = "CONTENT_LENGTH\000${llen}\000SCGI\001\000";
my $hlen = length $header;
if ( ( defined $src ) && ( $src eq "socket" ) ) {
for $socket (@sockets)
{
socket( SOCK, PF_UNIX, SOCK_STREAM, 0 ) or die;
connect( SOCK, sockaddr_un( $socket ) ) or die $!;
my $line = "${hlen}:${header},${line}";
print SOCK $line;
print SOCK construct_line($socket);
flush SOCK;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {
@ -145,8 +160,7 @@ foreach ( @views ) {
{
socket( SOCK, PF_INET, SOCK_STREAM, getprotobyname( "tcp" ) );
connect( SOCK, sockaddr_in( $port, inet_aton( $ip ) ) );
my $line = "${hlen}:${header},${line}";
print SOCK $line;
print SOCK construct_line($port);
flush SOCK;
while ( $line = <SOCK> ) {
if ( $line =~ /$pattern/ ) {