From 28555b467997beb12b340e9a88bcec928fa27c7a Mon Sep 17 00:00:00 2001 From: markster Date: Tue, 27 Jul 2004 04:13:04 +0000 Subject: [PATCH] Allow optional event whenever an agent is called from a queue (bug #2066) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3523 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_queue.c | 20 ++++++++++++++++++-- configs/queues.conf.sample | 5 +++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/apps/app_queue.c b/apps/app_queue.c index 9acaa234e..bd8e04830 100755 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -217,6 +217,7 @@ struct ast_call_queue { int rrpos; /* Round Robin - position */ int wrapped; /* Round Robin - wrapped around? */ int joinempty; /* Do we care if the queue has no members? */ + int eventwhencalled; /* Generate an event when the agent is called (before pickup) */ struct member *members; /* Member channels to be tried */ struct queue_ent *head; /* Start of the actual queue */ @@ -585,9 +586,22 @@ static int ring_entry(struct queue_ent *qe, struct localuser *tmp) tmp->chan = NULL; tmp->stillgoing = 0; return 0; - } else + } else { + if (qe->parent->eventwhencalled) { + manager_event(EVENT_FLAG_AGENT, "AgentCalled", + "AgentCalled: %s/%s\r\n" + "ChannelCalling: %s\r\n" + "CallerID: %s\r\n" + "Context: %s\r\n" + "Extension: %s\r\n" + "Priority: %d\r\n", + tmp->tech, tmp->numsubst, qe->chan->name, + tmp->chan->callerid ? tmp->chan->callerid : "unknown <>", + qe->chan->context, qe->chan->exten, qe->chan->priority); + } if (option_verbose > 2) - ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", tmp->numsubst); + ast_verbose(VERBOSE_PREFIX_3 "Called %s/%s\n", tmp->tech, tmp->numsubst); + } return 0; } @@ -1833,6 +1847,8 @@ static void reload_queues(void) } } else if (!strcasecmp(var->name, "joinempty")) { q->joinempty = ast_true(var->value); + } else if (!strcasecmp(var->name, "eventwhencalled")) { + q->eventwhencalled = ast_true(var->value); } else { ast_log(LOG_WARNING, "Unknown keyword in queue '%s': %s at line %d of queue.conf\n", cat, var->name, var->lineno); } diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample index ab331e1e8..72719c492 100755 --- a/configs/queues.conf.sample +++ b/configs/queues.conf.sample @@ -111,6 +111,11 @@ ; ; joinempty = yes ; +; Asterisk can generate AgentCalled events when an agent is rung, if this is turned on +; (may generate a LOT of extra manager events) +; +; eventwhencalled = yes +; ; Each member of this call queue is listed on a separate line in ; the form technology/dialstring. "member" means a normal member of a ; queue. An optional penalty may be specified after a comma, such that