[Asterisk-cvs] asterisk ChangeLog, 1.74.2.59, 1.74.2.60 logger.c, 1.45.2.6, 1.45.2.7

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory localhost.localdomain:/tmp/cvs-serv15088

Modified Files:
      Tag: v1-0
	ChangeLog logger.c 
Log Message:
make sure an automatic log rotation doesn't result in nasty recursion (bug #4646)


Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.74.2.59
retrieving revision 1.74.2.60
diff -u -d -r1.74.2.59 -r1.74.2.60
--- ChangeLog	7 Jul 2005 15:26:17 -0000	1.74.2.59
+++ ChangeLog	7 Jul 2005 17:43:48 -0000	1.74.2.60
@@ -7,6 +7,10 @@
     -- We now ensure buffer policy is restored after RAS is done with a channel.
        This could cause audio problems on the channel after zapras is done
        with it. 
+ -- logger
+    -- The Asterisk logger will automatically detect when a log file needs to
+       be rotated.  However, this feature could put Asterisk in a nasty loop
+       that would result in a crash.
  -- general
     -- Added man pages for astgenkey, autosupport, and safe_asterisk
 

Index: logger.c
===================================================================
RCS file: /usr/cvsroot/asterisk/logger.c,v
retrieving revision 1.45.2.6
retrieving revision 1.45.2.7
diff -u -d -r1.45.2.6 -r1.45.2.7
--- logger.c	15 May 2005 15:55:30 -0000	1.45.2.6
+++ logger.c	7 Jul 2005 17:43:48 -0000	1.45.2.7
@@ -358,6 +358,8 @@
 
 	ast_mutex_unlock(&loglock);
 
+	pending_logger_reload = 0;
+
 	queue_log_init();
 
 	if (eventlog) {
@@ -369,7 +371,7 @@
 	} else 
 		ast_log(LOG_ERROR, "Unable to create event log: %s\n", strerror(errno));
 	init_logger_chain();
-	pending_logger_reload = 0;
+	
 	return -1;
 }