[svn-commits] tilghman: branch 1.8 r279390 - /branches/1.8/main/logger.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sun Jul 25 12:32:21 2010
New Revision: 279390

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=279390
Log:
Don't assume qlog is open.

(closes issue #17704)
 Reported by: vrban
 Patches: 
       issue17704.patch uploaded by pabelanger (license 224)
 Tested by: vrban

Modified:
    branches/1.8/main/logger.c

Modified: branches/1.8/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/logger.c?view=diff&rev=279390&r1=279389&r2=279390
==============================================================================
--- branches/1.8/main/logger.c (original)
+++ branches/1.8/main/logger.c Sun Jul 25 12:32:21 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;
 }