[svn-commits] russell: branch group/newcdr r203466 - in /team/group/newcdr: include/asteris...

[SVN commits to the Digium repositories]

Author: russell
Date: Thu Jun 25 17:22:17 2009
New Revision: 203466

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=203466
Log:
Don't start killing CEL data until after channels have been stopped so that we
get as many CEL events as possible.

Modified:
    team/group/newcdr/include/asterisk/_private.h
    team/group/newcdr/main/asterisk.c
    team/group/newcdr/main/cel.c

Modified: team/group/newcdr/include/asterisk/_private.h
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/include/asterisk/_private.h?view=diff&rev=203466&r1=203465&r2=203466
==============================================================================
--- team/group/newcdr/include/asterisk/_private.h (original)
+++ team/group/newcdr/include/asterisk/_private.h Thu Jun 25 17:22:17 2009
@@ -43,7 +43,6 @@
 int ast_indications_reload(void);/*!< Provided by indications.c */
 void ast_stun_init(void);               /*!< Provided by stun.c */
 int ast_cel_engine_init(void);		/*!< Provided by cel.c */
-void ast_cel_engine_term(void);		/*!< Provided by cel.c */
 int ast_cel_engine_reload(void);	/*!< Provided by cel.c */
 
 /*!

Modified: team/group/newcdr/main/asterisk.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/main/asterisk.c?view=diff&rev=203466&r1=203465&r2=203466
==============================================================================
--- team/group/newcdr/main/asterisk.c (original)
+++ team/group/newcdr/main/asterisk.c Thu Jun 25 17:22:17 2009
@@ -1552,7 +1552,6 @@
 	int x;
 	/* Try to get as many CDRs as possible submitted to the backend engines (if in batch mode) */
 	ast_cdr_engine_term();
-	ast_cel_engine_term();
 	if (safeshutdown) {
 		shuttingdown = 1;
 		if (!niceness) {

Modified: team/group/newcdr/main/cel.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/main/cel.c?view=diff&rev=203466&r1=203465&r2=203466
==============================================================================
--- team/group/newcdr/main/cel.c (original)
+++ team/group/newcdr/main/cel.c Thu Jun 25 17:22:17 2009
@@ -610,6 +610,14 @@
 	return !strcasecmp(app1, app2) ? CMP_MATCH | CMP_STOP : 0;
 }
 
+static void ast_cel_engine_term(void)
+{
+	if (appset) {
+		ao2_ref(appset, -1);
+		appset = NULL;
+	}
+}
+
 int ast_cel_engine_init(void)
 {
 	if (!(appset = ao2_container_alloc(NUM_APP_BUCKETS, app_hash, app_cmp))) {
@@ -628,17 +636,11 @@
 		return -1;
 	}
 
+	ast_register_atexit(ast_cel_engine_term);
+
 	return 0;
 }
 
-void ast_cel_engine_term(void)
-{
-	if (appset) {
-		ao2_ref(appset, -1);
-		appset = NULL;
-	}
-}
-
 int ast_cel_engine_reload(void)
 {
 	return do_reload();