[svn-commits] russell: branch group/newcdr r202762 - in /team/group/newcdr: configs/ main/

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Jun 23 17:08:47 2009
New Revision: 202762

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=202762
Log:
Attempt to clarify date format option

Modified:
    team/group/newcdr/configs/cel.conf.sample
    team/group/newcdr/main/cel.c

Modified: team/group/newcdr/configs/cel.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/configs/cel.conf.sample?view=diff&rev=202762&r1=202761&r2=202762
==============================================================================
--- team/group/newcdr/configs/cel.conf.sample (original)
+++ team/group/newcdr/configs/cel.conf.sample Tue Jun 23 17:08:47 2009
@@ -75,11 +75,16 @@
 ; Use the 'dateformat' keyword to specify the date format used when CEL events
 ; are raised.
 ;
-; Accepted values: A printf-style format string??? REALLY???
-; Default value: %ld.%06ld
-;                (Unix time followed by current number of microseconds)
-
-;dateformat = %ld.%06ld
+; Accepted values: A strftime format string (see man strftime)
+;
+; Example: "%F %T"
+;  -> This gives the date and time in the format "2009-06-23 17:02:35"
+;
+; If this option is not specified, the default format is "<seconds>.<microseconds>"
+; since epoch.  The microseconds field will always be 6 digits in length, meaning it
+; may have leading zeros.
+;
+;dateformat = %F %T
 
 ;
 ; Asterisk Manager Interface (AMI) CEL Backend

Modified: team/group/newcdr/main/cel.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/main/cel.c?view=diff&rev=202762&r1=202761&r2=202762
==============================================================================
--- team/group/newcdr/main/cel.c (original)
+++ team/group/newcdr/main/cel.c Tue Jun 23 17:08:47 2009
@@ -367,12 +367,6 @@
 	}
 }
 
-/*
- * \todo Resolve dateformat strangeness - if you don't specify one in the config it
- *       uses a default of "%ld.%06ld" (and is passed 2 arguments), but if you do
- *       specify one (even if you explicitly specify "%ld.%06ld") it will only
- *       get passed a single argument.
- */
 struct ast_channel *ast_cel_fabricate_channel_from_event(const struct ast_event *event)
 {
 	struct varshead *headp;