mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-15 00:41:02 +00:00
Moved the update of the queue_ent's rule list to just before we try to call
queue members. This allows for the change in penalty levels to be executed at the most logical time frame. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94396 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -4266,6 +4266,11 @@ check_turns:
|
|||||||
if ((res = say_periodic_announcement(&qe,ringing)))
|
if ((res = say_periodic_announcement(&qe,ringing)))
|
||||||
goto stop;
|
goto stop;
|
||||||
|
|
||||||
|
/* see if we need to move to the next penalty level for this queue */
|
||||||
|
while (qe.pr && ((time(NULL) - qe.start) > qe.pr->time)) {
|
||||||
|
update_qe_rule(&qe);
|
||||||
|
}
|
||||||
|
|
||||||
/* Try calling all queue members for 'timeout' seconds */
|
/* Try calling all queue members for 'timeout' seconds */
|
||||||
res = try_calling(&qe, args.options, args.announceoverride, args.url, &tries, &noption, args.agi, args.macro, args.gosub, ringing);
|
res = try_calling(&qe, args.options, args.announceoverride, args.url, &tries, &noption, args.agi, args.macro, args.gosub, ringing);
|
||||||
if (res) {
|
if (res) {
|
||||||
@@ -4317,11 +4322,6 @@ check_turns:
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* see if we need to move to the next penalty level for this queue */
|
|
||||||
while (qe.pr && ((time(NULL) - qe.start) > qe.pr->time)) {
|
|
||||||
update_qe_rule(&qe);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If using dynamic realtime members, we should regenerate the member list for this queue */
|
/* If using dynamic realtime members, we should regenerate the member list for this queue */
|
||||||
update_realtime_members(qe.parent);
|
update_realtime_members(qe.parent);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user