--- app_queue.c.orig	2006-06-04 04:43:36.000000000 +0200
+++ app_queue.c	2006-07-20 16:08:31.000000000 +0200
@@ -2021,7 +2021,7 @@
 		/* If we have timed out, break out */
 		if (qe->expire && (time(NULL) > qe->expire)) {
 			*reason = QUEUE_TIMEOUT;
-			ast_queue_log(qe->parent->name, qe->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;
 		}
 
@@ -3089,7 +3089,7 @@
 			if (!res) 
 				break;
 			if (valid_exit(&qe, res)) {
-				ast_queue_log(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;
 			}
 		}
@@ -3108,7 +3108,7 @@
 					record_abandoned(&qe);
 					reason = QUEUE_TIMEOUT;
 					res = 0;
-					ast_queue_log(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;
 				}
 
@@ -3116,7 +3116,7 @@
 					/* Make a position announcement, if enabled */
 					if (qe.parent->announcefrequency && !ringing &&
 					    (res = say_position(&qe))) {
-						ast_queue_log(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;
 					}
 
@@ -3126,7 +3126,7 @@
 				/* Make a periodic announcement, if enabled */
 				if (qe.parent->periodicannouncefrequency && !ringing &&
 				    (res = say_periodic_announcement(&qe))) {
-					ast_queue_log(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;
 				}
 
@@ -3139,7 +3139,7 @@
 							ast_queue_log(queuename, chan->uniqueid, "NONE", "ABANDON", "%d|%d|%ld", qe.pos, qe.opos, (long)time(NULL) - qe.start);
 						}
 					} else if (valid_exit(&qe, res)) {
-						ast_queue_log(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;
 				}
@@ -3167,7 +3167,7 @@
 					record_abandoned(&qe);
 					reason = QUEUE_TIMEOUT;
 					res = 0;
-					ast_queue_log(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;
 				}
 
@@ -3183,14 +3183,14 @@
 					break;
 				}
 				if (res && valid_exit(&qe, res)) {
-					ast_queue_log(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(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;