[asterisk-commits] qwell: branch qwell/queue_events r390341 - in /team/qwell/queue_events: ./ ap...

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri May 31 15:28:24 2013
New Revision: 390341

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=390341
Log:
Remove eventmemberstatus, too.  Document the removal.

Modified:
    team/qwell/queue_events/CHANGES
    team/qwell/queue_events/apps/app_queue.c
    team/qwell/queue_events/configs/queues.conf.sample

Modified: team/qwell/queue_events/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/qwell/queue_events/CHANGES?view=diff&rev=390341&r1=390340&r2=390341
==============================================================================
--- team/qwell/queue_events/CHANGES (original)
+++ team/qwell/queue_events/CHANGES Fri May 31 15:28:24 2013
@@ -231,6 +231,11 @@
    Note: the suffix '_avail' after the queuename.
    Reports 'InUse' for no logged in agents or no free agents.
    Reports 'Idle' when an agent is free.
+
+ * The configuration options eventwhencalled and eventmemberstatus have been
+   removed.  As a result, the AMI events QueueMemberStatus, AgentCalled,
+   AgentConnect, AgentComplete, AgentDump, and AgentRingNoAnswer will always be
+   sent.  The "Variable" fields will also no longer exist on the Agent* events.
 
 Core
 ------------------

Modified: team/qwell/queue_events/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/queue_events/apps/app_queue.c?view=diff&rev=390341&r1=390340&r2=390341
==============================================================================
--- team/qwell/queue_events/apps/app_queue.c (original)
+++ team/qwell/queue_events/apps/app_queue.c Fri May 31 15:28:24 2013
@@ -1513,7 +1513,6 @@
 	unsigned int announceholdtime:2;
 	unsigned int announceposition:3;
 	int strategy:4;
-	unsigned int maskmemberstatus:1;
 	unsigned int realtime:1;
 	unsigned int found:1;
 	unsigned int relativeperiodicannounce:1;
@@ -2074,10 +2073,6 @@
 {
 	m->status = status;
 
-	if (q->maskmemberstatus) {
-		return;
-	}
-
 	queue_publish_member_blob(queue_member_status_type(), queue_member_blob_create(q, m));
 }
 
@@ -2387,7 +2382,6 @@
 	q->joinempty = 0;
 	q->leavewhenempty = 0;
 	q->memberdelay = 0;
-	q->maskmemberstatus = 0;
 	q->weight = 0;
 	q->timeoutrestart = 0;
 	q->periodicannouncefrequency = 0;
@@ -2775,8 +2769,6 @@
 		parse_empty_options(val, &q->joinempty, 1);
 	} else if (!strcasecmp(param, "leavewhenempty")) {
 		parse_empty_options(val, &q->leavewhenempty, 0);
-	} else if (!strcasecmp(param, "eventmemberstatus")) {
-		q->maskmemberstatus = !ast_true(val);
 	} else if (!strcasecmp(param, "reportholdtime")) {
 		q->reportholdtime = ast_true(val);
 	} else if (!strcasecmp(param, "memberdelay")) {
@@ -9676,7 +9668,6 @@
 	MEMBER(call_queue, wrapped, AST_DATA_BOOLEAN)			\
 	MEMBER(call_queue, timeoutrestart, AST_DATA_BOOLEAN)		\
 	MEMBER(call_queue, announceholdtime, AST_DATA_INTEGER)		\
-	MEMBER(call_queue, maskmemberstatus, AST_DATA_BOOLEAN)		\
 	MEMBER(call_queue, realtime, AST_DATA_BOOLEAN)			\
 	MEMBER(call_queue, found, AST_DATA_BOOLEAN)			\
 	MEMBER(call_queue, announcepositionlimit, AST_DATA_INTEGER)	\

Modified: team/qwell/queue_events/configs/queues.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/qwell/queue_events/configs/queues.conf.sample?view=diff&rev=390341&r1=390340&r2=390341
==============================================================================
--- team/qwell/queue_events/configs/queues.conf.sample (original)
+++ team/qwell/queue_events/configs/queues.conf.sample Fri May 31 15:28:24 2013
@@ -475,20 +475,6 @@
 ; loose - penalty,invalid
 ;
 
-; If this is set to yes, the following manager events will be generated:
-; AgentCalled, AgentDump, AgentConnect, AgentComplete; setting this to
-; vars also sends all channel variables with the event.
-; (may generate some extra manager events, but probably ones you want)
-;
-; eventwhencalled = yes|no|vars
-;
-; If this is set to yes, the following manager events will be generated:
-; QueueMemberStatus
-; (may generate a WHOLE LOT of extra manager events)
-; The default value is yes and this can not be set globally.
-;
-; eventmemberstatus = no
-;
 ; If you wish to report the caller's hold time to the member before they are
 ; connected to the caller, set this to yes.
 ;