--- app_queue.orig.c	Mon Nov 27 11:02:30 2006
+++ app_queue.c	Mon Nov 27 11:29:40 2006
@@ -2726,8 +2726,8 @@
 				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"
@@ -2743,8 +2743,8 @@
 						(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, peer->name, "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"
@@ -3480,7 +3480,7 @@
 			if (!res)
 				break;
 			if (valid_exit(&qe, res)) {
-				ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHKEY", "%s|%d", qe.digits, qe.pos);
+				ast_queue_log(queuename, chan->uniqueid, "NONE", "EXITWITHKEY", "%d|%d|%ld|%s", qe.pos, qe.opos, (long)time(NULL) - qe.start, qe.digits);
 				break;
 			}
 		}
@@ -3500,7 +3500,7 @@
 					record_abandoned(&qe);
 					reason = QUEUE_TIMEOUT;
 					res = 0;
-					ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d", qe.pos);
+					ast_queue_log(queuename, chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld", qe.pos, qe.opos,(long)time(NULL) - qe.start);
 					break;
 				}
 
@@ -3508,7 +3508,7 @@
 					/* Make a position announcement, if enabled */
 					if (qe.parent->announcefrequency && !ringing &&
 						(res = say_position(&qe))) {
-						ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHKEY", "%s|%d", qe.digits, qe.pos);
+						ast_queue_log(queuename, chan->uniqueid, "NONE", "EXITWITHKEY", "%d|%d|%ld|%s", qe.pos, qe.opos, (long)time(NULL) - qe.start, qe.digits);
 						break;
 					}
 
@@ -3518,7 +3518,7 @@
 				/* Make a periodic announcement, if enabled */
 				if (qe.parent->periodicannouncefrequency && !ringing &&
 					(res = say_periodic_announcement(&qe))) {
-					ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHKEY", "%c|%d", res, qe.pos);
+					ast_queue_log(queuename, chan->uniqueid, "NONE", "EXITWITHKEY", "%d|%d|%ld|%s", qe.pos, qe.opos, (long)time(NULL) - qe.start, qe.digits);
 					break;
 				}
 
@@ -3533,8 +3533,8 @@
 								(long) time(NULL) - qe.start);
 						}
 					} else if (valid_exit(&qe, res)) {
-						ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHKEY",
-							"%s|%d", qe.digits, qe.pos);
+						ast_queue_log(queuename, chan->uniqueid, "NONE", "EXITWITHKEY", "%d|%d|%ld|%s", 
+							qe.pos, qe.opos, (long)time(NULL) - qe.start, qe.digits);
 					}
 					break;
 				}
@@ -3568,7 +3568,7 @@
 					record_abandoned(&qe);
 					reason = QUEUE_TIMEOUT;
 					res = 0;
-					ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d", qe.pos);
+					ast_queue_log(qe.parent->name, qe.chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld", qe.pos, qe.opos, (long)time(NULL) - qe.start);
 					break;
 				}
 
@@ -3584,14 +3584,14 @@
 					break;
 				}
 				if (res && valid_exit(&qe, res)) {
-					ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHKEY", "%s|%d", qe.digits, qe.pos);
+					ast_queue_log(queuename, chan->uniqueid, "NONE", "EXITWITHKEY", "%d|%d|%ld|%s", qe.pos, qe.opos, (long)time(NULL) - qe.start, qe.digits);
 					break;
 				}
 				/* exit after 'timeout' cycle if 'n' option enabled */
 				if (go_on) {
 					if (option_verbose > 2)
 						ast_verbose(VERBOSE_PREFIX_3 "Exiting on time-out cycle\n");
-					ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d", qe.pos);
+					ast_queue_log(queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d|%d|%ld", qe.pos, qe.opos,(long)time(NULL) - qe.start);
 					record_abandoned(&qe);
 					reason = QUEUE_TIMEOUT;
 					res = 0;