[svn-commits] tilghman: trunk r279391 - in /trunk: ./ main/logger.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sun Jul 25 12:33:45 2010
New Revision: 279391

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=279391
Log:
Merged revisions 279390 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r279390 | tilghman | 2010-07-25 12:32:21 -0500 (Sun, 25 Jul 2010) | 8 lines
  
  Don't assume qlog is open.
  
  (closes issue #17704)
   Reported by: vrban
   Patches: 
         issue17704.patch uploaded by pabelanger (license 224)
   Tested by: vrban
........

Modified:
    trunk/   (props changed)
    trunk/main/logger.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Sun Jul 25 12:33:45 2010
@@ -1,1 +1,1 @@
-/branches/1.8:1-279056,279113,279227,279273,279280,279314
+/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390

Modified: trunk/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/logger.c?view=diff&rev=279391&r1=279390&r2=279391
==============================================================================
--- trunk/main/logger.c (original)
+++ trunk/main/logger.c Sun Jul 25 12:33:45 2010
@@ -690,9 +690,10 @@
 					break;
 				}
 			}
-
-			fclose(qlog);
-			qlog = NULL;
+			if (qlog) {
+				fclose(qlog);
+				qlog = NULL;
+			}
 			snprintf(old, sizeof(old), "%s/%s", ast_config_AST_LOG_DIR, queue_log_name);
 			if (queue_rotate) {
 				rotate_file(old);
@@ -720,8 +721,9 @@
 	a full Asterisk reload) */
 int logger_reload(void)
 {
-	if(reload_logger(0))
+	if (reload_logger(0)) {
 		return RESULT_FAILURE;
+	}
 	return RESULT_SUCCESS;
 }