dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix /status page in branch 1.4 and trunk (references #727)

Browse Source
This commit is contained in:
David COUTADEUR 2014-07-22 16:29:03 +00:00
parent 433f17b445
commit 9e267def6f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_example/conf/lmConf-1
View File

@ -62,7 +62,7 @@ macros
'$data1 = {'_whatToTrace' => '$_auth eq \'SAML\' ? "$_user\\@$_idpConfKey" : "$_user"'};'
whatToTrace
'$_whatToTrace'
'_whatToTrace'
loginHistoryEnabled
1

14
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main.pm
View File

@ -55,13 +55,14 @@ use Lemonldap::NG::Handler::Main::Logger;
# @param optional url string URL to log, if undefined defaults to request URI
sub updateStatus {
my ( $class, $action, $user, $url ) = @_;
my $statusPipe = $tsv->{statusPipe};
$user ||= Lemonldap::NG::Handler::API->remote_ip;
$url ||= Lemonldap::NG::Handler::API->uri_with_args;
eval {
print { $tsv->{statusPipe} } "$user => "
print $statusPipe "$user => "
. Lemonldap::NG::Handler::API->hostname
. "$url $action\n"
if ( $tsv->{statusPipe} );
if ( $statusPipe );
};
}
@ -495,18 +496,19 @@ sub unlog ($$) {
# @return Apache2::Const::OK
sub status($$) {
my $class = shift;
my $statusPipe = $tsv->{statusPipe};
my $statusOut = $tsv->{statusOut};
Lemonldap::NG::Handler::Main::Logger->lmLog( "Request for status", 'debug' );
return $class->abort( "$class: status page can not be displayed" )
unless ( $tsv->{statusPipe} and $tsv->{statusOut} );
print { $tsv->{statusPipe} } "STATUS"
unless ( $statusPipe and $statusOut );
print $statusPipe "STATUS"
. (
Lemonldap::NG::Handler::API->args
? " " . Lemonldap::NG::Handler::API->args
: ''
) . "\n";
my $buf;
my $statusOut = $tsv->{statusOut};
while ($statusOut) {
while (<$statusOut>) {
last if (/^END$/);
$buf .= $_;
}