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:
parent
66adefc789
commit
982a66a93a
1 changed files with 23 additions and 25 deletions
|
@ -1211,7 +1211,7 @@ static void recalc_holdtime(struct queue_ent *qe)
|
||||||
|
|
||||||
ast_mutex_lock(&qe->parent->lock);
|
ast_mutex_lock(&qe->parent->lock);
|
||||||
if (newvalue <= qe->parent->servicelevel)
|
if (newvalue <= qe->parent->servicelevel)
|
||||||
qe->parent->callscompletedinsl++;
|
qe->parent->callscompletedinsl++;
|
||||||
oldvalue = qe->parent->holdtime;
|
oldvalue = qe->parent->holdtime;
|
||||||
qe->parent->holdtime = (((oldvalue << 2) - oldvalue) + newvalue) >> 2;
|
qe->parent->holdtime = (((oldvalue << 2) - oldvalue) + newvalue) >> 2;
|
||||||
ast_mutex_unlock(&qe->parent->lock);
|
ast_mutex_unlock(&qe->parent->lock);
|
||||||
|
@ -1753,7 +1753,7 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
|
||||||
if (f) {
|
if (f) {
|
||||||
if (f->frametype == AST_FRAME_CONTROL) {
|
if (f->frametype == AST_FRAME_CONTROL) {
|
||||||
switch(f->subclass) {
|
switch(f->subclass) {
|
||||||
case AST_CONTROL_ANSWER:
|
case AST_CONTROL_ANSWER:
|
||||||
/* This is our guy if someone answered. */
|
/* This is our guy if someone answered. */
|
||||||
if (!peer) {
|
if (!peer) {
|
||||||
if (option_verbose > 2)
|
if (option_verbose > 2)
|
||||||
|
@ -2193,7 +2193,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
|
||||||
/* Agent must have hung up */
|
/* Agent must have hung up */
|
||||||
ast_log(LOG_WARNING, "Agent on %s hungup on the customer. They're going to be pissed.\n", peer->name);
|
ast_log(LOG_WARNING, "Agent on %s hungup on the customer. They're going to be pissed.\n", peer->name);
|
||||||
ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "AGENTDUMP", "%s", "");
|
ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "AGENTDUMP", "%s", "");
|
||||||
record_abandoned(qe);
|
record_abandoned(qe);
|
||||||
if (qe->parent->eventwhencalled) {
|
if (qe->parent->eventwhencalled) {
|
||||||
manager_event(EVENT_FLAG_AGENT, "AgentDump",
|
manager_event(EVENT_FLAG_AGENT, "AgentDump",
|
||||||
"Queue: %s\r\n"
|
"Queue: %s\r\n"
|
||||||
|
@ -2223,7 +2223,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
|
||||||
if (res < 0) {
|
if (res < 0) {
|
||||||
ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "SYSCOMPAT", "%s", "");
|
ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "SYSCOMPAT", "%s", "");
|
||||||
ast_log(LOG_WARNING, "Had to drop call because I couldn't make %s compatible with %s\n", qe->chan->name, peer->name);
|
ast_log(LOG_WARNING, "Had to drop call because I couldn't make %s compatible with %s\n", qe->chan->name, peer->name);
|
||||||
record_abandoned(qe);
|
record_abandoned(qe);
|
||||||
ast_hangup(peer);
|
ast_hangup(peer);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -2403,7 +2403,7 @@ static int remove_from_queue(char *queuename, char *interface)
|
||||||
free(last_member);
|
free(last_member);
|
||||||
|
|
||||||
if (queue_persistent_members)
|
if (queue_persistent_members)
|
||||||
dump_queue_members(q);
|
dump_queue_members(q);
|
||||||
|
|
||||||
res = RES_OKAY;
|
res = RES_OKAY;
|
||||||
} else {
|
} else {
|
||||||
|
@ -2440,16 +2440,16 @@ static int add_to_queue(char *queuename, char *interface, int penalty, int pause
|
||||||
new_member->next = q->members;
|
new_member->next = q->members;
|
||||||
q->members = new_member;
|
q->members = new_member;
|
||||||
manager_event(EVENT_FLAG_AGENT, "QueueMemberAdded",
|
manager_event(EVENT_FLAG_AGENT, "QueueMemberAdded",
|
||||||
"Queue: %s\r\n"
|
"Queue: %s\r\n"
|
||||||
"Location: %s\r\n"
|
"Location: %s\r\n"
|
||||||
"Membership: %s\r\n"
|
"Membership: %s\r\n"
|
||||||
"Penalty: %d\r\n"
|
"Penalty: %d\r\n"
|
||||||
"CallsTaken: %d\r\n"
|
"CallsTaken: %d\r\n"
|
||||||
"LastCall: %d\r\n"
|
"LastCall: %d\r\n"
|
||||||
"Status: %d\r\n"
|
"Status: %d\r\n"
|
||||||
"Paused: %d\r\n",
|
"Paused: %d\r\n",
|
||||||
q->name, new_member->interface, new_member->dynamic ? "dynamic" : "static",
|
q->name, new_member->interface, new_member->dynamic ? "dynamic" : "static",
|
||||||
new_member->penalty, new_member->calls, (int)new_member->lastcall, new_member->status, new_member->paused);
|
new_member->penalty, new_member->calls, (int)new_member->lastcall, new_member->status, new_member->paused);
|
||||||
|
|
||||||
if (dump)
|
if (dump)
|
||||||
dump_queue_members(q);
|
dump_queue_members(q);
|
||||||
|
@ -2489,7 +2489,7 @@ static int set_member_paused(char *queuename, char *interface, int paused)
|
||||||
mem->paused = paused;
|
mem->paused = paused;
|
||||||
|
|
||||||
if (queue_persistent_members)
|
if (queue_persistent_members)
|
||||||
dump_queue_members(q);
|
dump_queue_members(q);
|
||||||
|
|
||||||
ast_queue_log(q->name, "NONE", interface, (paused ? "PAUSE" : "UNPAUSE"), "%s", "");
|
ast_queue_log(q->name, "NONE", interface, (paused ? "PAUSE" : "UNPAUSE"), "%s", "");
|
||||||
|
|
||||||
|
@ -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)
|
||||||
|
@ -2981,7 +2981,7 @@ check_turns:
|
||||||
|
|
||||||
/* Leave if we have exceeded our queuetimeout */
|
/* Leave if we have exceeded our queuetimeout */
|
||||||
if (qe.expire && (time(NULL) > qe.expire)) {
|
if (qe.expire && (time(NULL) > qe.expire)) {
|
||||||
record_abandoned(&qe);
|
record_abandoned(&qe);
|
||||||
reason = QUEUE_TIMEOUT;
|
reason = QUEUE_TIMEOUT;
|
||||||
res = 0;
|
res = 0;
|
||||||
ast_queue_log(args.queuename, chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d", qe.pos);
|
ast_queue_log(args.queuename, chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d", qe.pos);
|
||||||
|
@ -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,12 +3067,10 @@ 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;
|
||||||
res = 0;
|
res = 0;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue