[interchange-cvs] [SCM] Interchange branch, master, updated. REL_5_7_3-18-g1460ae8

[Jon Jensen]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".

The branch, master has been updated
       via  1460ae8c33e65f0d7ab96fe126b874bf9a5b024a (commit)
       via  4b02f9c9a28e1c687c32a51cc6b68a6480b6e2eb (commit)
       via  545c1cf3edd3184764fb936f313d1a63f7acc4b1 (commit)
      from  7e3244de90b9b137287f74afbfbbab80cc611265 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1460ae8c33e65f0d7ab96fe126b874bf9a5b024a
Author: Jon Jensen <jon at endpoint.com>
Date:   Sat Nov 14 11:14:30 2009 -0700

    DisplayErrors: Add newline; remove double-log when syslogging catalog errors

commit 4b02f9c9a28e1c687c32a51cc6b68a6480b6e2eb
Author: Jon Jensen <jon at endpoint.com>
Date:   Sat Nov 14 10:26:25 2009 -0700

    Change log level 'auth' (which doesn't exist) to 'warning'
    
    'auth' is a facility, not a level.
    
    The erroneous 'auth' level setting was formerly a no-op because 'auth'
    wouldn't exist in a correctly-configured SysLog hash, but with the new
    logging code it actually passed through as intended and raised an error
    both in /usr/bin/logger and Sys::Syslog calls.

commit 545c1cf3edd3184764fb936f313d1a63f7acc4b1
Author: Jon Jensen <jon at endpoint.com>
Date:   Sat Nov 14 09:20:38 2009 -0700

    Close syslog as late as possible in response cycle
    
    Moving Syslog::closelog call from close_cat() into connection() to try to
    come after more oddball late log events in the page processing.
    
    Also use explicit void returns to document that those two subs' return
    values are not important.

-----------------------------------------------------------------------

Summary of changes and diff:
 lib/Vend/Dispatch.pm |    3 +--
 lib/Vend/File.pm     |    2 +-
 lib/Vend/Server.pm   |    5 +++++
 lib/Vend/Util.pm     |   19 ++++++++++---------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/lib/Vend/Dispatch.pm b/lib/Vend/Dispatch.pm
index 577e9f7..b3e376e 100644
--- a/lib/Vend/Dispatch.pm
+++ b/lib/Vend/Dispatch.pm
@@ -1179,8 +1179,7 @@ sub close_cat {
 	put_session() if $Vend::HaveSession;
 	close_session() if $Vend::SessionOpen;
 	close_database();
-	Sys::Syslog::closelog(), undef $Vend::SysLogReady
-		if $Vend::SysLogReady;
+	return;
 }
 
 sub run_macro {
diff --git a/lib/Vend/File.pm b/lib/Vend/File.pm
index e456bf6..f880405 100644
--- a/lib/Vend/File.pm
+++ b/lib/Vend/File.pm
@@ -758,7 +758,7 @@ sub log_file_violation {
 	}
 
 	::logError($msg);
-	::logGlobal({ level => 'auth'}, $msg);
+	::logGlobal({ level => 'warning' }, $msg);
 }
 
 1;
diff --git a/lib/Vend/Server.pm b/lib/Vend/Server.pm
index 240a683..dbd21e5 100644
--- a/lib/Vend/Server.pm
+++ b/lib/Vend/Server.pm
@@ -1010,6 +1010,11 @@ sub connection {
     $display .= "($show_in_ps)" if $show_in_ps;
 
     set_process_name($display);
+
+    Sys::Syslog::closelog(), undef $Vend::SysLogReady
+        if $Vend::SysLogReady;
+
+    return;
 }
 
 ## Signals
diff --git a/lib/Vend/Util.pm b/lib/Vend/Util.pm
index e3f270d..cf1eb9e 100644
--- a/lib/Vend/Util.pm
+++ b/lib/Vend/Util.pm
@@ -1527,7 +1527,8 @@ ALERT: Attempt to %s at %s from:
 	SCRIPT_NAME  %s
 	PATH_INFO    %s
 EOF
-		logGlobal ({level => 'auth'}, $fmt,
+		logGlobal({ level => 'warning' },
+						$fmt,
 						$msg,
 						$CGI::script_name,
 						$CGI::host,
@@ -1548,7 +1549,7 @@ EOF
 		ne  $Vend::Cfg->{Password})
 	{
 		::logGlobal(
-				{level => 'auth'},
+				{ level => 'warning' },
 				"ALERT: Password mismatch, attempt to %s at %s from %s",
 				$msg,
 				$CGI::script_name,
@@ -1573,7 +1574,7 @@ ALERT: Attempt to %s %s per user name:
 EOF
 
 		::logGlobal(
-			{level => 'auth'},
+			{ level => 'warning' },
 			$fmt,
 			$CGI::script_name,
 			$msg,
@@ -1601,8 +1602,8 @@ Attempt to %s on %s, secure operations disabled.
 	SCRIPT_NAME  %s
 	PATH_INFO    %s
 EOF
-		::logGlobal (
-				{level => 'auth'},
+		::logGlobal(
+				{ level => 'warning' },
 				$fmt,
 				$msg,
 				$CGI::script_name,
@@ -1729,7 +1730,7 @@ sub logGlobal {
 
 	$msg = errmsg($msg, @_) if @_;
 
-	$Vend::Errors .= $msg if $Global::DisplayErrors;
+	$Vend::Errors .= $msg . "\n" if $Global::DisplayErrors;
 
 	my $nl = $opt->{strip} ? '' : "\n";
 	print "$msg$nl"
@@ -1869,14 +1870,14 @@ sub logError {
 
 	$msg = format_log_msg($msg) unless $msg =~ s/^\\//;
 
-	$Vend::Errors .= $msg
-		if $Vend::Cfg->{DisplayErrors} || $Global::DisplayErrors;
-
 	if ($Global::SysLog) {
 		logGlobal({ level => 'err' }, $msg);
 		return;
 	}
 
+	$Vend::Errors .= $msg . "\n"
+		if $Vend::Cfg->{DisplayErrors} || $Global::DisplayErrors;
+
     my $reason;
     if (! allowed_file($opt->{file}, 1)) {
         $@ = 'access';


hooks/post-receive
-- 
Interchange