From 6060a5453649d3d30c504511be0d702bf60c39f8 Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Thu, 19 Nov 2020 21:51:58 +0100 Subject: [PATCH] Use whatToTrace in log (#2393) --- .../lib/Lemonldap/NG/Portal/Plugins/CheckUser.pm | 5 ++++- .../lib/Lemonldap/NG/Portal/Plugins/SingleSession.pm | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/CheckUser.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/CheckUser.pm index 5af7dc3a6..d8a10e987 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/CheckUser.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/CheckUser.pm @@ -262,7 +262,10 @@ sub check { } # Check identities rule - $self->logger->info("\"$user\" is an unrestricted user!") if $unUser; + $self->logger->info( '"' + . $savedUserData->{ $self->conf->{whatToTrace} } + . '" is an unrestricted user!' ) + if $unUser; unless ( $unUser || $self->idRule->( $req, $attrs ) ) { $self->userLogger->warn( "checkUser requested for an invalid user ($user)"); diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/SingleSession.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/SingleSession.pm index fc19d11c2..8455c83b8 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/SingleSession.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/SingleSession.pm @@ -182,7 +182,7 @@ sub removeOther { } return $self->p->do( $req, [ sub { $res } ] ) if $res; - $self->userLogger->info("$count remaining session(s) have been removed"); + $self->userLogger->info("$count remaining session(s) removed"); $req->mustRedirect(1); return $self->p->autoRedirect($req); }