svn commit: r106656 - /perl/modperl/trunk/t/response/TestAPI/aplog.pm

[st...@apache.org]

Author: stas
Date: Fri Nov 26 12:14:45 2004
New Revision: 106656

URL: http://svn.apache.org/viewcvs?view=rev&rev=106656
Log:
notice() messages ignore the LogLevel value and always get
logged by Apache design (unless error log is set to syslog)

Modified:
   perl/modperl/trunk/t/response/TestAPI/aplog.pm

Modified: perl/modperl/trunk/t/response/TestAPI/aplog.pm
Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestAPI/aplog.pm?view=diff&rev=106656&p1=perl/modperl/trunk/t/response/TestAPI/aplog.pm&r1=106655&p2=perl/modperl/trunk/t/response/TestAPI/aplog.pm&r2=106656
==============================================================================
--- perl/modperl/trunk/t/response/TestAPI/aplog.pm	(original)
+++ perl/modperl/trunk/t/response/TestAPI/aplog.pm	Fri Nov 26 12:14:45 2004
@@ -28,7 +28,9 @@
     my $r = shift;
     my $s = $r->server;
 
-    plan $r, tests => (@LogLevels * 2) + 19;
+    my $orig_log_level = $s->loglevel;
+
+    plan $r, tests => (@LogLevels * 2) + 20;
 
     my $logdiff = TestCommon::LogDiff->new($path);
 
@@ -110,7 +112,7 @@
             qr/\[error\] \$s->log_error test/,
             '$s->log_error(...)';
     }
-    
+
     # log_reason
     {
         t_server_log_error_is_expected();
@@ -118,7 +120,7 @@
         ok t_cmp $logdiff->diff,
             qr/\[error\] access to.*failed.*reason: \$r->log_reason test/,
             '$r->log_reason(msg)';
-        
+
         t_server_log_error_is_expected();
         $r->log_reason('$r->log_reason filename test','filename');
         ok t_cmp $logdiff->diff,
@@ -150,6 +152,23 @@
         ok 1;
     }
 
+    # notice() messages ignore the LogLevel value and always get
+    # logged by Apache design (unless error log is set to syslog)
+    {
+        my $local_log_level = $s->loglevel;
+
+        $r->server->loglevel(Apache::LOG_ERR);
+        my $ignore = $logdiff->diff; # reset fh
+        # notice < error
+        my $msg = "This message should appear with LogLevel=error!";
+        $r->log->notice($msg);
+        ok t_cmp $logdiff->diff,
+            qr/[notice] .*? $msg/,
+            "notice() logs regardless of LogLevel";
+        $s->loglevel($local_log_level);
+    }
+
+
     t_server_log_warn_is_expected();
     $s->warn('$s->warn test');
     ok t_cmp $logdiff->diff,
@@ -178,6 +197,9 @@
     ok t_cmp $logdiff->diff,
         qr/\[warn\] warn test/,
         'overriden via export warn()';
+
+    # restore the orig LogLevel
+    $s->loglevel($orig_log_level);
 
     Apache::OK;
 }