Make sure that callers kicked from queue because of joinempty and leavewhenempty...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24566 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 3123427487cb05f7502b11df2ecdd6c0ae272af9..7f8c86aa6d9e08ab47532204c8a7d97d9c0e680c 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1960,6 +1960,7 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r
                /* leave the queue if no agents, if enabled */
                if (qe->parent->leavewhenempty && (stat == QUEUE_NO_MEMBERS)) {
                        *reason = QUEUE_LEAVEEMPTY;
+                       ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long)time(NULL) - qe->start);
                        leave_queue(qe);
                        break;
                }
@@ -1967,6 +1968,7 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r
                /* leave the queue if no reachable agents, if enabled */
                if ((qe->parent->leavewhenempty == QUEUE_EMPTY_STRICT) && (stat == QUEUE_NO_REACHABLE_MEMBERS)) {
                        *reason = QUEUE_LEAVEUNAVAIL;
+                       ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long)time(NULL) - qe->start);
                        leave_queue(qe);
                        break;
                }
@@ -2999,7 +3001,7 @@ check_turns:
                        if (res < 0) {
                                /* Record this abandoned call */
                                record_abandoned(&qe);
-                                ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON", "%d|%d|%ld", qe.pos, qe.opos, (long)time(NULL) - qe.start);
+                               ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON", "%d|%d|%ld", qe.pos, qe.opos, (long)time(NULL) - qe.start);
                                if (option_verbose > 2) {
                                        ast_verbose(VERBOSE_PREFIX_3 "User disconnected from queue %s while waiting their turn\n", args.queuename);
                                }

diff --git a/doc/queuelog.txt b/doc/queuelog.txt
index aa6365e3694a22d51a2a92ec91208269c274e503..fa8cb48e8557e282a6f129e33cf16192e7230126 100644 (file)
--- a/doc/queuelog.txt
+++ b/doc/queuelog.txt
@@ -61,6 +61,14 @@ ENTERQUEUE(url|callerid)
 A call has entered the queue.  URL (if specified) and Caller*ID are placed
 in the log.
 
+EXITEMPTY(position|origposition|waittime)
+The caller was exited from the queue forcefully because the queue had no
+reachable members and it's configured to do that to callers when there
+are no reachable members. The position is the caller's position in the
+queue when they hungup, the origposition is the original position the 
+caller was when they first entered the queue, and the waittime is how 
+long the call had been waiting in the queue at the time of disconnect.
+
 EXITWITHKEY(key|position)
 The caller elected to use a menu key to exit the queue.  The key and
 the caller's position in the queue are recorded.