Merged revisions 52416 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r52416 | file | 2007-01-26 21:13:41 -0500 (Fri, 26 Jan 2007) | 10 lines

Merged revisions 52415 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r52415 | file | 2007-01-26 21:09:10 -0500 (Fri, 26 Jan 2007) | 2 lines

Make COMPLETECALLER and COMPLETEAGENT output to queue_log follow documentation. (issue #7677 reported by amilcar)

........

................

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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 716141c4a9a3694c3afedd02dec37064bd14d35e..a692d15298b2ab9f3582a6e7e340ab530ab112b7 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2728,8 +2728,8 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
                                qe->chan->exten, qe->chan->context, (long) (callstart - qe->start),
                                (long) (time(NULL) - callstart));
                } else if (qe->chan->_softhangup) {
-                       ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "COMPLETECALLER", "%ld|%ld",
-                               (long) (callstart - qe->start), (long) (time(NULL) - callstart));
+                       ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "COMPLETECALLER", "%ld|%ld|%d",
+                               (long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos);
                        if (qe->parent->eventwhencalled)
                                manager_event(EVENT_FLAG_AGENT, "AgentComplete",
                                                "Queue: %s\r\n"
@@ -2745,8 +2745,8 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
                                                (long)(callstart - qe->start), (long)(time(NULL) - callstart),
                                                qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
                } else {
-                       ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETEAGENT", "%ld|%ld",
-                               (long) (callstart - qe->start), (long) (time(NULL) - callstart));
+                       ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETEAGENT", "%ld|%ld|%d",
+                               (long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos);
                        if (qe->parent->eventwhencalled)
                                manager_event(EVENT_FLAG_AGENT, "AgentComplete",
                                                "Queue: %s\r\n"