Record bridge channel unique id in "CONNECT" queue_log entry and the corresponding...

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

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 5f3845ba971c3f66f747a4cccb13a60c0f19633e..5ada44ee864a992e87133a811b6831bc869a1c2c 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -68,6 +68,11 @@ Applications:
 
 * OSPAuth is added to authenticate OSP tokens in in_bound call setup messages.
 
+* The CONNECT event in the queue_log from app_queue now has a second field 
+  in addition to the holdtime field. It contains the unique ID of the 
+  queue member channel that is taking the call. This is useful when trying 
+  to link recording filenames back to a particular call from the queue.  
+
 Manager:
 
 * After executing the 'status' manager action, the "Status" manager events
@@ -77,6 +82,11 @@ Manager:
   until after the release of 1.4, when it will be removed.  Please use the time
   during the 1.4 release to make this transition.
 
+* The AgentConnect event now has an additional field called "BridgedChannel" 
+  which contains the unique ID of the queue member channel that is taking the 
+  call. This is useful when trying to link recording filenames back to 
+  a particular call from the queue.
+
 Variables:
 
 * The builtin variables ${CALLERID}, ${CALLERIDNAME}, ${CALLERIDNUM},

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 7d943b242a6e5aa64eccd863e102d76ed157692b..092aa709449315aa77211242a43cf8803f1933b6 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2241,16 +2241,17 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
                                ast_log(LOG_DEBUG, "app_queue: sendurl=%s.\n", url);
                        ast_channel_sendurl(peer, url);
                }
-               ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "CONNECT", "%ld", (long)time(NULL) - qe->start);
+               ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "CONNECT", "%ld|%s", (long)time(NULL) - qe->start, peer->uniqueid);
                if (qe->parent->eventwhencalled)
                        manager_event(EVENT_FLAG_AGENT, "AgentConnect",
                                      "Queue: %s\r\n"
                                      "Uniqueid: %s\r\n"
                                      "Channel: %s\r\n"
                                      "Member: %s\r\n"
-                                     "Holdtime: %ld\r\n",
+                                     "Holdtime: %ld\r\n"
+                                     "BridgedChannel: %s\r\n",
                                      queuename, qe->chan->uniqueid, peer->name, member->interface,
-                                     (long)time(NULL) - qe->start);
+                                     (long)time(NULL) - qe->start,peer->uniqueid);
                ast_copy_string(oldcontext, qe->chan->context, sizeof(oldcontext));
                ast_copy_string(oldexten, qe->chan->exten, sizeof(oldexten));
                time(&callstart);

diff --git a/doc/queuelog.txt b/doc/queuelog.txt
index 374b7a488bb2123b1953f4a9ab17bb89b28753ac..e4dc66efba451118de7aa8bef2c4f1ea66dd1d30 100644 (file)
--- a/doc/queuelog.txt
+++ b/doc/queuelog.txt
@@ -50,9 +50,12 @@ origposition.
 CONFIGRELOAD
 The configuration has been reloaded (e.g. with asterisk -rx reload)
 
-CONNECT(holdtime)
+CONNECT(holdtime|bridgedchanneluniqueid)
 The caller was connected to an agent.  Hold time represents the amount
-of time the caller was on hold.
+of time the caller was on hold. The bridged channel unique ID contains
+the unique ID of the queue member channel that is taking the call. This
+is useful when trying to link recording filenames to a particular
+call in the queue.
 
 ENTERQUEUE(url|callerid)
 A call has entered the queue.  URL (if specified) and Caller*ID are placed