worteks
/
lemonldap-ng
mirror of https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use IO::Select for handler status (#1448)

Browse Source
environments/ppa-mbqj77/deployments/16
Xavier Guimard 7 years ago
parent 019f1e75e8
commit 56dd0610fa
2 changed files with 163 additions and 150 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 311
      lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/Status.pm
  2. 2
      lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Run.pm

311
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Lib/Status.pm
Unescape View File

@ -6,6 +6,7 @@ package Lemonldap::NG::Handler::Lib::Status;
use strict;
use POSIX qw(setuid setgid);
use JSON qw(to_json);
use IO::Select;
our $VERSION = '2.0.0';
@ -115,182 +116,194 @@ eval {
# - display results
sub run {
$| = 1;
my ( $lastMn, $mn, $count, $cache );
while (<STDIN>) {
$mn = int( time / 60 ) - $start + 1;
# Cleaning activity array
if ( $mn > $lastMn ) {
for ( my $i = 0 ; $i < $mn - $lastMn ; $i++ ) {
unshift @$activity, {};
delete $activity->[ MN_COUNT + 1 ];
my ( $lastMn, $mn, $count, $cache, @ready );
my $sel = IO::Select->new;
$sel->add( \*STDIN );
while ( @ready = $sel->can_read ) {
foreach my $fh (@ready) {
if($fh == \*STDIN and $fh->eof) {
exit;
}
}
$lastMn = $mn;
$_ = $fh->getline or next;
$mn = int( time / 60 ) - $start + 1;
# Cleaning activity array
if ( $mn > $lastMn ) {
for ( my $i = 0 ; $i < $mn - $lastMn ; $i++ ) {
unshift @$activity, {};
delete $activity->[ MN_COUNT + 1 ];
}
}
$lastMn = $mn;
# Activity collect
if (
# Activity collect
if (
/^(\S+)\s+=>\s+(\S+)\s+(OK|REJECT|REDIRECT|LOGOUT|UNPROTECT|\-?\d+)$/
)
{
my ( $user, $uri, $code ) = ( $1, $2, $3 );
)
{
my ( $user, $uri, $code ) = ( $1, $2, $3 );
# Portal error translation
$code = portalTab->{$code} || $code if ( $code =~ /^\-?\d+$/ );
# Portal error translation
$code = portalTab->{$code} || $code if ( $code =~ /^\-?\d+$/ );
# Per user activity
$status->{user}->{$user}->{$code}++;
# Per user activity
$status->{user}->{$user}->{$code}++;
# Per uri activity
$uri =~ s/^(.*?)\?.*$/$1/;
$status->{uri}->{$uri}->{$code}++;
$count->{uri}->{$uri}++;
# Per uri activity
$uri =~ s/^(.*?)\?.*$/$1/;
$status->{uri}->{$uri}->{$code}++;
$count->{uri}->{$uri}++;
# Per vhost activity
my ($vhost) = ( $uri =~ /^([^\/]+)/ );
$status->{vhost}->{$vhost}->{$code}++;
$count->{vhost}->{$vhost}++;
# Last 5 minutes activity
$activity->[0]->{$code}++;
}
# Per vhost activity
my ($vhost) = ( $uri =~ /^([^\/]+)/ );
$status->{vhost}->{$vhost}->{$code}++;
$count->{vhost}->{$vhost}++;
elsif (/^RELOADCACHE(?:\s+(\S+?),(.+))?$/) {
if ( my ( $cacheModule, $cacheOptions ) = ( $1, $2 ) ) {
eval "use $cacheModule;"
. "\$cache = new $cacheModule($cacheOptions);";
print STDERR "$@\n" if ($@); # TODO: use logger instead
# Last 5 minutes activity
$activity->[0]->{$code}++;
}
else {
$cache = undef;
}
}
# Status requests
# $args contains parameters passed to url status page (a=1 for example
# if request is http://test.example.com/status?a=1). To be used
# later...
elsif (/^STATUS(?:\s+(\S+))?$/) {
my $tmp = $1;
my $args = {};
%$args = split( /[=&]/, $tmp ) if ($tmp);
&head unless ( $args->{json} );
my ( $c, $m, $u );
foreach my $user ( keys %{ $status->{user} } ) {
my $v = $status->{user}->{$user};
$u++ unless ( $user =~ /^\d+\.\d+\.\d+\.\d+$/ );
# Total requests
foreach ( keys %$v ) {
$c->{$_} += $v->{$_};
elsif (/^RELOADCACHE(?:\s+(\S+?),(.+))?$/) {
if ( my ( $cacheModule, $cacheOptions ) = ( $1, $2 ) ) {
eval "use $cacheModule;"
. "\$cache = new $cacheModule($cacheOptions);";
print STDERR "$@\n" if ($@); # TODO: use logger instead
}
else {
$cache = undef;
}
}
for ( my $i = 1 ; $i < @$activity ; $i++ ) {
$m->{$_} += $activity->[$i]->{$_}
foreach ( keys %{ $activity->[$i] } );
}
foreach ( keys %$m ) {
$m->{$_} = sprintf( "%.2f", $m->{$_} / MN_COUNT );
$m->{$_} = int( $m->{$_} ) if ( $m->{$_} > 99 );
}
# JSON values
if ( $args->{json} ) {
print to_json( { average => $m, total => $c } ) . "\nEND\n";
}
# Status requests
# $args contains parameters passed to url status page (a=1 for example
# if request is http://test.example.com/status?a=1). To be used
# later...
elsif (/^STATUS\s*(\S+)?$/) {
my $tmp = $1;
my $args = {};
%$args = split( /[=&]/, $tmp ) if ($tmp);
&head unless ( $args->{json} );
my ( $c, $m, $u );
foreach my $user ( keys %{ $status->{user} } ) {
my $v = $status->{user}->{$user};
$u++ unless ( $user =~ /^\d+\.\d+\.\d+\.\d+$/ );
# Total requests
foreach ( keys %$v ) {
$c->{$_} += $v->{$_};
}
}
for ( my $i = 1 ; $i < @$activity ; $i++ ) {
$m->{$_} += $activity->[$i]->{$_}
foreach ( keys %{ $activity->[$i] } );
}
foreach ( keys %$m ) {
$m->{$_} = sprintf( "%.2f", $m->{$_} / MN_COUNT );
$m->{$_} = int( $m->{$_} ) if ( $m->{$_} > 99 );
}
# Raw values (Dump)
elsif ( $args->{'dump'} ) {
print "<div id=\"dump\"><pre>\n";
print Dumper( $status, $activity, $count );
print "</pre></div>\n";
&end;
}
else {
# JSON values
if ( $args->{json} ) {
print to_json( { average => $m, total => $c } ) . "\nEND\n";
}
# Total requests
print "<h2>Total</h2>\n<div id=\"total\"><pre>\n";
print sprintf( "%-30s : \%6d (%.02f / mn)\n",
$_, $c->{$_}, $c->{$_} / $mn )
foreach ( sort keys %$c );
print "\n</pre></div>\n";
# Average
print "<h2>Average for last " . MN_COUNT
. " minutes</h2>\n<div id=\"average\"><pre>\n";
print sprintf( "%-30s : %6s / mn\n", $_, $m->{$_} )
foreach ( sort keys %$m );
print "\n</pre></div>\n";
# Users connected
print "<div id=\"users\"><p>\nTotal users : $u\n</p></div>\n";
# Local cache
if ($cache) {
my @t = $cache->get_keys( $_[1]->{namespace} );
print "<div id=\"cache\"><p>\nLocal Cache : " . @t
. " objects\n</p></div>\n";
# Raw values (Dump)
elsif ( $args->{'dump'} ) {
require Data::Dumper;
print "<div id=\"dump\"><pre>\n";
print Data::Dumper::Dumper( $status, $activity, $count );
print "</pre></div>\n";
&end;
}
else {
# Uptime
print "<div id=\"up\"><p>\nServer up for : "
. &timeUp($mn)
. "\n</p></div>\n";
# Total requests
print "<h2>Total</h2>\n<div id=\"total\"><pre>\n";
print sprintf( "%-30s : \%6d (%.02f / mn)\n",
$_, $c->{$_}, $c->{$_} / $mn )
foreach ( sort keys %$c );
print "\n</pre></div>\n";
# Top uri
if ( $args->{top} ) {
print "<hr/>\n";
$args->{categories} ||=
'REJECT,PORTAL_FIRSTACCESS,LOGOUT,OK';
# Average
print "<h2>Average for last " . MN_COUNT
. " minutes</h2>\n<div id=\"average\"><pre>\n";
print sprintf( "%-30s : %6s / mn\n", $_, $m->{$_} )
foreach ( sort keys %$m );
print "\n</pre></div>\n";
# Vhost activity
# Users connected
print
"<h2>Virtual Host activity</h2>\n<div id=\"vhost\"><pre>\n";
foreach (
sort { $count->{vhost}->{$b} <=> $count->{vhost}->{$a} }
keys %{ $count->{vhost} }
)
{
print
sprintf( "%-40s : %6d\n", $_, $count->{vhost}->{$_} );
}
print "\n</pre></div>\n";
"<div id=\"users\"><p>\nTotal users : $u\n</p></div>\n";
# General
print "<h2>Top used URI</h2>\n<div id=\"uri\"><pre>\n";
my $i = 0;
foreach (
sort { $count->{uri}->{$b} <=> $count->{uri}->{$a} }
keys %{ $count->{uri} }
)
{
last if ( $i == $args->{top} );
last unless ( $count->{uri}->{$_} );
$i++;
print
sprintf( "%-80s : %6d\n", $_, $count->{uri}->{$_} );
# Local cache
if ($cache) {
my @t = $cache->get_keys( $_[1]->{namespace} );
print "<div id=\"cache\"><p>\nLocal Cache : " . @t
. " objects\n</p></div>\n";
}
print "\n</pre></div>\n";
# Top by category
print
"<table class=\"topByCat\"><tr><th style=\"width:20%\">Code</th><th>Top</th></tr>\n";
foreach my $cat ( split /,/, $args->{categories} ) {
# Uptime
print "<div id=\"up\"><p>\nServer up for : "
. &timeUp($mn)
. "\n</p></div>\n";
# Top uri
if ( $args->{top} ) {
print "<hr/>\n";
$args->{categories} ||=
'REJECT,PORTAL_FIRSTACCESS,LOGOUT,OK';
# Vhost activity
print
"<h2>Virtual Host activity</h2>\n<div id=\"vhost\"><pre>\n";
foreach (
sort {
$count->{vhost}->{$b} <=> $count->{vhost}->{$a}
}
keys %{ $count->{vhost} }
)
{
print sprintf( "%-40s : %6d\n",
$_, $count->{vhost}->{$_} );
}
print "\n</pre></div>\n";
# General
print "<h2>Top used URI</h2>\n<div id=\"uri\"><pre>\n";
my $i = 0;
foreach (
sort { $count->{uri}->{$b} <=> $count->{uri}->{$a} }
keys %{ $count->{uri} }
)
{
last if ( $i == $args->{top} );
last unless ( $count->{uri}->{$_} );
$i++;
print sprintf( "%-80s : %6d\n",
$_, $count->{uri}->{$_} );
}
print "\n</pre></div>\n";
# Top by category
print
"<tr><td>$cat</td><td nowrap>\n<div id=\"$cat\">\n";
topByCat( $cat, $args->{top} );
print "</div>\n</td></tr>";
"<table class=\"topByCat\"><tr><th style=\"width:20%\">Code</th><th>Top</th></tr>\n";
foreach my $cat ( split /,/, $args->{categories} ) {
print
"<tr><td>$cat</td><td nowrap>\n<div id=\"$cat\">\n";
topByCat( $cat, $args->{top} );
print "</div>\n</td></tr>";
}
print "</table>\n";
}
print "</table>\n";
}
&end;
&end;
}
}
else {
print STDERR "Status: Unknown command line : $_";
}
}
else {
print STDERR "Status: Unknown command line : $_";
}
}
}

2
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Run.pm
Unescape View File

@ -42,7 +42,7 @@ sub getStatus {
my $statusOut = $class->tsv->{statusOut};
return $class->abort( $req, "$class: status page can not be displayed" )
unless ( $statusPipe and $statusOut );
print $statusPipe "STATUS" . ( $req->{env}->{QUERY_STRING} || '' ) . "\n";
print $statusPipe "STATUS " . ( $req->{env}->{QUERY_STRING} || '' ) . "\n";
my $buf;
while (<$statusOut>) {

Write Preview
Loading…
Cancel
Save