[asterisk-commits] tilghman: trunk r91173 - in /trunk: ./ cdr/ configs/ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Dec  5 10:46:47 2007
New Revision: 91173

URL: http://svn.digium.com/view/asterisk?view=rev&rev=91173
Log:
Change cdr_manager to use a "CDR" level, rather than the (overcrowded) "call" level.
(Closes issue #11015)

Modified:
    trunk/CHANGES
    trunk/UPGRADE.txt
    trunk/cdr/cdr_manager.c
    trunk/configs/manager.conf.sample
    trunk/include/asterisk/manager.h
    trunk/main/manager.c

Modified: trunk/CHANGES
URL: http://svn.digium.com/view/asterisk/trunk/CHANGES?view=diff&rev=91173&r1=91172&r2=91173
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Wed Dec  5 10:46:47 2007
@@ -23,6 +23,8 @@
   * Added a "ListAllVoicemailUsers" action that allows you to get a list of all
      the voicemail users setup.
   * Added 'DBDel' and 'DBDelTree' manager commands.
+  * cdr_manager now reports events via the "cdr" level, separating it from
+     the very verbose "call" level.
 
 Dialplan functions
 ------------------

Modified: trunk/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/trunk/UPGRADE.txt?view=diff&rev=91173&r1=91172&r2=91173
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Wed Dec  5 10:46:47 2007
@@ -146,3 +146,7 @@
 * The IAXpeers command output has been changed to more closely resemble the
   output of the SIPpeers command.
 
+* cdr_manager now reports at the "cdr" level, not at "call"  You may need to
+   change your manager.conf to add the level to existing AMI users, if they
+   want to see the CDR events generated.
+

Modified: trunk/cdr/cdr_manager.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr/cdr_manager.c?view=diff&rev=91173&r1=91172&r2=91173
==============================================================================
--- trunk/cdr/cdr_manager.c (original)
+++ trunk/cdr/cdr_manager.c Wed Dec  5 10:46:47 2007
@@ -146,7 +146,7 @@
 		pbx_substitute_variables_helper(&dummy, customfields->str, buf, sizeof(buf) - 1);
 	}
 
-	manager_event(EVENT_FLAG_CALL, "Cdr",
+	manager_event(EVENT_FLAG_CDR, "Cdr",
 	    "AccountCode: %s\r\n"
 	    "Source: %s\r\n"
 	    "Destination: %s\r\n"

Modified: trunk/configs/manager.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/manager.conf.sample?view=diff&rev=91173&r1=91172&r2=91173
==============================================================================
--- trunk/configs/manager.conf.sample (original)
+++ trunk/configs/manager.conf.sample Wed Dec  5 10:46:47 2007
@@ -71,5 +71,5 @@
 ;displayconnects = yes	; Display on CLI user login/logoff
 ;
 ; Authorization for various classes 
-;read = system,call,log,verbose,command,agent,user,config,dtmf,reporting
-;write = system,call,log,verbose,command,agent,user,config,dtmf,reporting
+;read = system,call,log,verbose,command,agent,user,config,dtmf,reporting,cdr
+;write = system,call,log,verbose,command,agent,user,config,dtmf,reporting,cdr

Modified: trunk/include/asterisk/manager.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/manager.h?view=diff&rev=91173&r1=91172&r2=91173
==============================================================================
--- trunk/include/asterisk/manager.h (original)
+++ trunk/include/asterisk/manager.h Wed Dec  5 10:46:47 2007
@@ -63,6 +63,8 @@
 #define EVENT_FLAG_CONFIG		(1 << 7) /* Ability to modify configurations */
 #define EVENT_FLAG_DTMF  		(1 << 8) /* Ability to read DTMF events */
 #define EVENT_FLAG_REPORTING		(1 << 9) /* Reporting events such as rtcp sent */
+#define EVENT_FLAG_CDR			(1 << 10) /* CDR events */
+
 /* Export manager structures */
 #define AST_MAX_MANHEADERS 128
 

Modified: trunk/main/manager.c
URL: http://svn.digium.com/view/asterisk/trunk/main/manager.c?view=diff&rev=91173&r1=91172&r2=91173
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed Dec  5 10:46:47 2007
@@ -309,6 +309,7 @@
 	{ EVENT_FLAG_CONFIG, "config" },
 	{ EVENT_FLAG_DTMF, "dtmf" },
 	{ EVENT_FLAG_REPORTING, "reporting" },
+	{ EVENT_FLAG_CDR, "cdr" },
 	{ -1, "all" },
 	{ 0, "none" },
 };