diff options
author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-26 16:00:20 +0000 |
---|---|---|
committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-26 16:00:20 +0000 |
commit | 83ae8a836f08d4389500a86a1d36c53b1b99d5ff (patch) | |
tree | 03e44762aacfdf28e7dfa532acbabb12b23e2d08 | |
parent | cdd9c99c6011b20e377fbd97d8c67d2cbf560989 (diff) |
Merged r265612 from 1.6.2:
Merged revisions 265611 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r265611 | mnicholson | 2010-05-25 12:00:11 -0500 (Tue, 25 May 2010) | 15 lines
Merged revisions 265610 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r265610 | mnicholson | 2010-05-25 11:48:19 -0500 (Tue, 25 May 2010) | 8 lines
Don't mark the cdr records of unanswered queue calls with "NOANSWER". This restores the behavior prior to r258670.
(closes issue #17334)
Reported by: jvandal
Patches:
queue-cdr-fixes1.diff uploaded by mnicholson (license 96)
Tested by: aragon, jvandal
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.2.8-rc2@265892 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_queue.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 797b08787..4e805a21b 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3942,7 +3942,6 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce ast_log(LOG_NOTICE, "Caller was about to talk to agent on %s but the caller hungup.\n", peer->name); ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "ABANDON", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start); record_abandoned(qe); - ast_cdr_noanswer(qe->chan->cdr); ast_hangup(peer); ao2_ref(member, -1); return -1; @@ -5169,7 +5168,6 @@ check_turns: /* Leave if we have exceeded our queuetimeout */ if (qe.expire && (time(NULL) >= qe.expire)) { record_abandoned(&qe); - ast_cdr_noanswer(qe.chan->cdr); reason = QUEUE_TIMEOUT; res = 0; ast_queue_log(args.queuename, chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld", @@ -5193,7 +5191,6 @@ check_turns: /* Leave if we have exceeded our queuetimeout */ if (qe.expire && (time(NULL) >= qe.expire)) { record_abandoned(&qe); - ast_cdr_noanswer(qe.chan->cdr); reason = QUEUE_TIMEOUT; res = 0; ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d", qe.pos); @@ -5215,7 +5212,6 @@ check_turns: int status = 0; if ((status = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty, qe.parent->leavewhenempty))) { record_abandoned(&qe); - ast_cdr_noanswer(qe.chan->cdr); reason = QUEUE_LEAVEEMPTY; ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe.pos, qe.opos, (long)(time(NULL) - qe.start)); res = 0; @@ -5228,7 +5224,6 @@ check_turns: ast_verb(3, "Exiting on time-out cycle\n"); ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d", qe.pos); record_abandoned(&qe); - ast_cdr_noanswer(qe.chan->cdr); reason = QUEUE_TIMEOUT; res = 0; break; @@ -5238,7 +5233,6 @@ check_turns: /* Leave if we have exceeded our queuetimeout */ if (qe.expire && (time(NULL) >= qe.expire)) { record_abandoned(&qe); - ast_cdr_noanswer(qe.chan->cdr); reason = QUEUE_TIMEOUT; res = 0; ast_queue_log(qe.parent->name, qe.chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld", qe.pos, qe.opos, (long) time(NULL) - qe.start); @@ -5267,7 +5261,6 @@ stop: if (res < 0) { if (!qe.handled) { record_abandoned(&qe); - ast_cdr_noanswer(qe.chan->cdr); ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON", "%d|%d|%ld", qe.pos, qe.opos, (long) time(NULL) - qe.start); |