From 588d43887984de98dc6abd61be89f122776dc27e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Deltombe?= <fxdeltombe@gmail.com>
Date: Thu, 3 Jul 2014 15:20:20 +0000
Subject: [PATCH] Handler: adjust few things about logs and loglevel (#630)

---
 lemonldap-ng-handler/lib/Lemonldap/NG/Handler/API/CGI.pm   | 7 +++----
 .../lib/Lemonldap/NG/Handler/Main/Logger.pm                | 3 ++-
 lemonldap-ng-handler/t/52-Lemonldap-NG-Handler-AuthBasic.t | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/API/CGI.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/API/CGI.pm
index 897664727..14127173f 100644
--- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/API/CGI.pm
+++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/API/CGI.pm
@@ -25,8 +25,8 @@ use constant SERVER_ERROR => 500;
 use constant AUTH_REQUIRED => 401;
 
 # Log level, since it can't be set in server config
-# Default value 'info' can be changed in lemonldap-ng.ini or in init args
-our $logLevel = "info";
+# Default value 'notice' can be changed in lemonldap-ng.ini or in init args
+our $logLevel = "notice";
 
 my $request; # object to store data about current request
 
@@ -57,8 +57,7 @@ sub newRequest {
 # @param $level string loglevel
 sub lmLog {
     my ( $class, $msg, $level ) = @_;
-    print STDERR "[$level]$module $msg\n"
-        if ($logLevel->{$level} >= $logLevel->{$lmLogLevel});
+    print STDERR "[$level] $msg\n";
 }
 
 ## @method void set_user(string user)
diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Logger.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Logger.pm
index 869cf4c8a..fd58ef04e 100755
--- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Logger.pm
+++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Logger.pm
@@ -43,7 +43,8 @@ sub lmLog {
         $file =~ s#.+/##;
         Lemonldap::NG::Handler::API->lmLog( "$file($line): $msg", "debug" );
     } else {
-        Lemonldap::NG::Handler::API->lmLog( "$file($line):", "debug" );
+        Lemonldap::NG::Handler::API->lmLog( "$file($line):", "debug" )
+            if ( $logLevel == 0 );
         Lemonldap::NG::Handler::API->lmLog( "Lemonldap::NG::Handler: $msg", $level );
     }
 }
diff --git a/lemonldap-ng-handler/t/52-Lemonldap-NG-Handler-AuthBasic.t b/lemonldap-ng-handler/t/52-Lemonldap-NG-Handler-AuthBasic.t
index 00f361cda..01447d8e0 100644
--- a/lemonldap-ng-handler/t/52-Lemonldap-NG-Handler-AuthBasic.t
+++ b/lemonldap-ng-handler/t/52-Lemonldap-NG-Handler-AuthBasic.t
@@ -25,6 +25,8 @@ $ini->flush();
 use Env qw(LLNG_DEFAULTCONFFILE);
 $LLNG_DEFAULTCONFFILE = $ini->filename;
 
+open STDERR, '>/dev/null';
+
 #########################
 
 # Insert your test code below, the Test::More module is use()ed here so read