kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 03:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 47432 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47432 | kpfleming | 2006-11-10 10:34:04 -0600 (Fri, 10 Nov 2006) | 2 lines

reflect addition/removal of dynamic queue members in queue_log, so that people using dialplan replacement for AgentCallbackLogin can still track login/logout (issue #7736, reported/patched by whoiswes but this commit was written by me and covers all three paths for AQM/RQM)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47434 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-11-10 16:37:42 +00:00
parent 2c5bbdc938
commit fed9126600
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_queue.c
View File

@@ -3202,6 +3202,7 @@ static int rqm_exec(struct ast_channel *chan, void *data)
case RES_OKAY: case RES_OKAY:
if (option_debug) if (option_debug)
ast_log(LOG_DEBUG, "Removed interface '%s' from queue '%s'\n", args.interface, args.queuename); ast_log(LOG_DEBUG, "Removed interface '%s' from queue '%s'\n", args.interface, args.queuename);
ast_queue_log(args.queuename, chan->uniqueid, args.interface, "REMOVEMEMBER", "%s", "");
pbx_builtin_setvar_helper(chan, "RQMSTATUS", "REMOVED"); pbx_builtin_setvar_helper(chan, "RQMSTATUS", "REMOVED");
res = 0; res = 0;
break; break;
@@ -3276,6 +3277,7 @@ static int aqm_exec(struct ast_channel *chan, void *data)
switch (add_to_queue(args.queuename, args.interface, args.membername, penalty, 0, queue_persistent_members)) { switch (add_to_queue(args.queuename, args.interface, args.membername, penalty, 0, queue_persistent_members)) {
case RES_OKAY: case RES_OKAY:
ast_queue_log(args.queuename, chan->uniqueid, args.interface, "ADDMEMBER", "%s", "");
ast_log(LOG_NOTICE, "Added interface '%s' to queue '%s'\n", args.interface, args.queuename); ast_log(LOG_NOTICE, "Added interface '%s' to queue '%s'\n", args.interface, args.queuename);
pbx_builtin_setvar_helper(chan, "AQMSTATUS", "ADDED"); pbx_builtin_setvar_helper(chan, "AQMSTATUS", "ADDED");
res = 0; res = 0;
@@ -4365,6 +4367,7 @@ static int manager_add_queue_member(struct mansession *s, struct message *m)
switch (add_to_queue(queuename, interface, membername, penalty, paused, queue_persistent_members)) { switch (add_to_queue(queuename, interface, membername, penalty, paused, queue_persistent_members)) {
case RES_OKAY: case RES_OKAY:
ast_queue_log(queuename, "MANAGER", interface, "ADDMEMBER", "%s", "");
astman_send_ack(s, m, "Added interface to queue"); astman_send_ack(s, m, "Added interface to queue");
break; break;
case RES_EXISTS: case RES_EXISTS:
@@ -4395,6 +4398,7 @@ static int manager_remove_queue_member(struct mansession *s, struct message *m)
switch (remove_from_queue(queuename, interface)) { switch (remove_from_queue(queuename, interface)) {
case RES_OKAY: case RES_OKAY:
ast_queue_log(queuename, "MANAGER", interface, "REMOVEMEMBER", "%s", "");
astman_send_ack(s, m, "Removed interface from queue"); astman_send_ack(s, m, "Removed interface from queue");
break; break;
case RES_EXISTS: case RES_EXISTS:
@@ -4473,6 +4477,7 @@ static int handle_queue_add_member(int fd, int argc, char *argv[])
switch (add_to_queue(queuename, interface, membername, penalty, 0, queue_persistent_members)) { switch (add_to_queue(queuename, interface, membername, penalty, 0, queue_persistent_members)) {
case RES_OKAY: case RES_OKAY:
ast_queue_log(queuename, "CLI", interface, "ADDMEMBER", "%s", "");
ast_cli(fd, "Added interface '%s' to queue '%s'\n", interface, queuename); ast_cli(fd, "Added interface '%s' to queue '%s'\n", interface, queuename);
return RESULT_SUCCESS; return RESULT_SUCCESS;
case RES_EXISTS: case RES_EXISTS:
@@ -4535,6 +4540,7 @@ static int handle_queue_remove_member(int fd, int argc, char *argv[])
switch (remove_from_queue(queuename, interface)) { switch (remove_from_queue(queuename, interface)) {
case RES_OKAY: case RES_OKAY:
ast_queue_log(queuename, "CLI", interface, "REMOVEMEMBER", "%s", "");
ast_cli(fd, "Removed interface '%s' from queue '%s'\n", interface, queuename); ast_cli(fd, "Removed interface '%s' from queue '%s'\n", interface, queuename);
return RESULT_SUCCESS; return RESULT_SUCCESS;
case RES_EXISTS: case RES_EXISTS: