diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-05-22 05:37:32 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-05-22 05:37:32 -0500 |
| commit | 95c6b98acf16f487fcc930bef7450ece1025ec20 (patch) | |
| tree | 22469bba87a094360fe6f40f64305d45b85988f4 /apps | |
| parent | 8a83b473f1a0b03515d295e97b98c75dddc85d00 (diff) | |
| parent | 045dbcc2d6e6b28645fad2c16843305c50150d5b (diff) | |
Merge "app_queue: Fix duplicate queue_log entries for EXITEMPTY and ABANDON"
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_queue.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 2389f0b13..0f46d280c 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -5465,7 +5465,8 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->parent->leavewhenempty, 0))) { *reason = QUEUE_LEAVEEMPTY; ast_queue_log(qe->parent->name, ast_channel_uniqueid(qe->chan), "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) (time(NULL) - qe->start)); - leave_queue(qe); + res = -1; + qe->handled = -1; break; } } @@ -6803,6 +6804,7 @@ static int try_calling(struct queue_ent *qe, struct ast_flags opts, char **opt_a ast_log(LOG_NOTICE, "Caller was about to talk to agent on %s but the caller hungup.\n", ast_channel_name(peer)); ast_queue_log(queuename, ast_channel_uniqueid(qe->chan), member->membername, "ABANDON", "%d|%d|%ld", qe->pos, qe->opos, (long) (time(NULL) - qe->start)); record_abandoned(qe); + qe->handled = -1; ast_channel_publish_dial(qe->chan, peer, member->interface, ast_hangup_cause_to_dial_status(ast_channel_hangupcause(peer))); ast_autoservice_chan_hangup_peer(qe->chan, peer); ao2_ref(member, -1); |