From bda98869366e5ac2781128b8719e70097748d561 Mon Sep 17 00:00:00 2001 From: mnicholson Date: Tue, 25 May 2010 17:06:04 +0000 Subject: 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/branches/1.6.2@265612 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_queue.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'apps') diff --git a/apps/app_queue.c b/apps/app_queue.c index 9c3b5fbe2..6ba45bf30 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3943,7 +3943,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; @@ -5167,7 +5166,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", @@ -5191,7 +5189,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); @@ -5213,7 +5210,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; @@ -5226,7 +5222,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; @@ -5236,7 +5231,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); @@ -5265,7 +5259,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); -- cgit v1.2.3