[asterisk-commits] qwell: branch 1.6.0 r110781 - in /branches/1.6.0: ./ cdr/cdr_custom.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Mar 25 17:52:24 2008
New Revision: 110781

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110781
Log:
Merged revisions 110780 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r110780 | qwell | 2008-03-25 17:51:55 -0500 (Tue, 25 Mar 2008) | 14 lines

Merged revisions 110779 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r110779 | qwell | 2008-03-25 17:51:17 -0500 (Tue, 25 Mar 2008) | 6 lines

Make file access in cdr_custom similar to cdr_csv.

Fixes issue #12268.

Patch borrowed from r82344

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/cdr/cdr_custom.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/cdr/cdr_custom.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/cdr/cdr_custom.c?view=diff&rev=110781&r1=110780&r2=110781
==============================================================================
--- branches/1.6.0/cdr/cdr_custom.c (original)
+++ branches/1.6.0/cdr/cdr_custom.c Tue Mar 25 17:52:24 2008
@@ -43,16 +43,16 @@
 #include "asterisk/config.h"
 #include "asterisk/pbx.h"
 #include "asterisk/utils.h"
+#include "asterisk/lock.h"
 
 #define CUSTOM_LOG_DIR "/cdr_custom"
 
 #define DATE_FORMAT "%Y-%m-%d %T"
 
 AST_MUTEX_DEFINE_STATIC(lock);
+AST_MUTEX_DEFINE_STATIC(mf_lock);
 
 static char *name = "cdr-custom";
-
-static FILE *mf = NULL;
 
 static char master[PATH_MAX];
 static char format[1024]="";
@@ -104,6 +104,8 @@
 
 static int custom_log(struct ast_cdr *cdr)
 {
+	FILE *mf = NULL;
+
 	/* Make sure we have a big enough buf */
 	char buf[2048];
 	struct ast_channel dummy;
@@ -120,23 +122,24 @@
 	/* because of the absolutely unconditional need for the
 	   highest reliability possible in writing billing records,
 	   we open write and close the log file each time */
+	ast_mutex_lock(&mf_lock);
 	mf = fopen(master, "a");
-	if (!mf) {
-		ast_log(LOG_ERROR, "Unable to re-open master file %s : %s\n", master, strerror(errno));
-	}
 	if (mf) {
 		fputs(buf, mf);
 		fflush(mf); /* be particularly anal here */
 		fclose(mf);
 		mf = NULL;
+		ast_mutex_unlock(&mf_lock);
+	} else {
+		ast_log(LOG_ERROR, "Unable to re-open master file %s : %s\n", master, strerror(errno));
+		ast_mutex_unlock(&mf_lock);
 	}
+
 	return 0;
 }
 
 static int unload_module(void)
 {
-	if (mf)
-		fclose(mf);
 	ast_cdr_unregister(name);
 	return 0;
 }
@@ -149,8 +152,6 @@
 		res = ast_cdr_register(name, ast_module_info->description, custom_log);
 		if (res)
 			ast_log(LOG_ERROR, "Unable to register custom CDR handling\n");
-		if (mf)
-			fclose(mf);
 		return res;
 	} else 
 		return AST_MODULE_LOAD_DECLINE;