[svn-commits] mjordan: trunk r425744 - in /trunk: ./ main/cdr.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Thu Oct 16 16:21:44 2014
New Revision: 425744

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=425744
Log:
main/cdr: Use 'time' when rescheduling batched CDRs as opposed to 'size'

When refactoring CDRs to use the configuration framework, a 'whoops' was
introduced where the CDR batch size was used when rescheduling a batch,
as opposed to the time duration. This patch corrects that obvious mistake.

ASTERISK-24426 #close
Reported by: Shane Blaser
........

Merged revisions 425735 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 425736 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/main/cdr.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cdr.c?view=diff&rev=425744&r1=425743&r2=425744
==============================================================================
--- trunk/main/cdr.c (original)
+++ trunk/main/cdr.c Thu Oct 16 16:21:44 2014
@@ -3520,7 +3520,7 @@
 	/* manually reschedule from this point in time */
 
 	ast_mutex_lock(&cdr_sched_lock);
-	cdr_sched = ast_sched_add(sched, mod_cfg->general->batch_settings.size * 1000, submit_scheduled_batch, NULL);
+	cdr_sched = ast_sched_add(sched, mod_cfg->general->batch_settings.time * 1000, submit_scheduled_batch, NULL);
 	ast_mutex_unlock(&cdr_sched_lock);
 	/* returning zero so the scheduler does not automatically reschedule */
 	return 0;