diff options
| author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-27 23:25:08 +0000 |
|---|---|---|
| committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-27 23:25:08 +0000 |
| commit | 7115c931e17e0bb92ca97abd0dcb8a88c8a8fbca (patch) | |
| tree | 1e53d663d9462559ed28882e4c444a29d3029a68 | |
| parent | dd9356da99482637afa9ddb8f2dc746997313ede (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@72380 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_mixmonitor.c | 4 | ||||
| -rw-r--r-- | apps/app_queue.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index 808cd58f8..9f3e2e32e 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -68,8 +68,8 @@ static const char *desc = "" " W(<x>) - Adjust the both heard and spoken volumes by a factor of <x>\n" " (range -4 to 4)\n\n" "<command> will be executed when the recording is over\n" -"Any strings matching ^{X} will be unescaped to ${X} and \n" -"all variables will be evaluated at that time.\n" +"Any strings matching ^{X} will be unescaped to ${X}.\n" +"All variables will be evaluated at the time MixMonitor is called.\n" "The variable MIXMONITOR_FILENAME will contain the filename used to record.\n" ""; diff --git a/apps/app_queue.c b/apps/app_queue.c index 74cee9c42..730c1153f 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2052,6 +2052,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; } @@ -2059,6 +2060,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; } @@ -3172,6 +3174,7 @@ check_turns: if (qe.parent->leavewhenempty && (stat == QUEUE_NO_MEMBERS)) { record_abandoned(&qe); reason = QUEUE_LEAVEEMPTY; + ast_queue_log(queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe.pos, qe.opos, (long)(time(NULL) - qe.start)); res = 0; break; } @@ -3180,6 +3183,7 @@ check_turns: if ((qe.parent->leavewhenempty == QUEUE_EMPTY_STRICT) && (stat == QUEUE_NO_REACHABLE_MEMBERS)) { record_abandoned(&qe); reason = QUEUE_LEAVEUNAVAIL; + ast_queue_log(queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe.pos, qe.opos, (long)(time(NULL) - qe.start)); res = 0; break; } |