mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-06 12:36:58 +00:00
Issue #6882
- move "res=-1" out of verbose block. - minor code cleanup Imported from 1.2 branch git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2958,8 +2958,8 @@ check_turns:
|
|||||||
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON", "%d|%d|%ld", qe.pos, qe.opos, (long)time(NULL) - qe.start);
|
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON", "%d|%d|%ld", qe.pos, qe.opos, (long)time(NULL) - qe.start);
|
||||||
if (option_verbose > 2) {
|
if (option_verbose > 2) {
|
||||||
ast_verbose(VERBOSE_PREFIX_3 "User disconnected from queue %s while waiting their turn\n", args.queuename);
|
ast_verbose(VERBOSE_PREFIX_3 "User disconnected from queue %s while waiting their turn\n", args.queuename);
|
||||||
res = -1;
|
|
||||||
}
|
}
|
||||||
|
res = -1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (!res)
|
if (!res)
|
||||||
@@ -3057,8 +3057,8 @@ check_turns:
|
|||||||
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON", "%d|%d|%ld", qe.pos, qe.opos, (long)time(NULL) - qe.start);
|
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON", "%d|%d|%ld", qe.pos, qe.opos, (long)time(NULL) - qe.start);
|
||||||
if (option_verbose > 2) {
|
if (option_verbose > 2) {
|
||||||
ast_verbose(VERBOSE_PREFIX_3 "User disconnected from queue %s when they almost made it\n", args.queuename);
|
ast_verbose(VERBOSE_PREFIX_3 "User disconnected from queue %s when they almost made it\n", args.queuename);
|
||||||
res = -1;
|
|
||||||
}
|
}
|
||||||
|
res = -1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (res && valid_exit(&qe, res)) {
|
if (res && valid_exit(&qe, res)) {
|
||||||
@@ -3067,10 +3067,8 @@ check_turns:
|
|||||||
}
|
}
|
||||||
/* exit after 'timeout' cycle if 'n' option enabled */
|
/* exit after 'timeout' cycle if 'n' option enabled */
|
||||||
if (go_on) {
|
if (go_on) {
|
||||||
if (option_verbose > 2) {
|
if (option_verbose > 2)
|
||||||
ast_verbose(VERBOSE_PREFIX_3 "Exiting on time-out cycle\n");
|
ast_verbose(VERBOSE_PREFIX_3 "Exiting on time-out cycle\n");
|
||||||
res = -1;
|
|
||||||
}
|
|
||||||
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d", qe.pos);
|
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d", qe.pos);
|
||||||
record_abandoned(&qe);
|
record_abandoned(&qe);
|
||||||
reason = QUEUE_TIMEOUT;
|
reason = QUEUE_TIMEOUT;
|
||||||
|
Reference in New Issue
Block a user