[svn-commits] irroot: branch irroot/distrotech-customers-1.8 r341633 - in /team/irroot/dist...

[SVN commits to the Digium repositories]

Author: irroot
Date: Thu Oct 20 14:19:16 2011
New Revision: 341633

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=341633
Log:
More Backport from trunk [app_queue]

Modified:
    team/irroot/distrotech-customers-1.8/apps/app_queue.c
    team/irroot/distrotech-customers-1.8/configs/queues.conf.sample

Modified: team/irroot/distrotech-customers-1.8/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/apps/app_queue.c?view=diff&rev=341633&r1=341632&r2=341633
==============================================================================
--- team/irroot/distrotech-customers-1.8/apps/app_queue.c (original)
+++ team/irroot/distrotech-customers-1.8/apps/app_queue.c Thu Oct 20 14:19:16 2011
@@ -8664,12 +8664,15 @@
 */
 static struct member *find_member_by_queuename_and_interface(const char *queuename, const char *interface)
 {
-	struct member *mem = NULL;
+	struct member tmpmem, *mem = NULL;
 	struct call_queue *q;
 
+	ast_copy_string(tmpmem.interface, interface, sizeof(tmpmem.interface));
 	if ((q = load_realtime_queue(queuename))) {
 		ao2_lock(q);
-		mem = ao2_find(q->members, interface, OBJ_KEY);
+		if ((mem = ao2_find(q->members, &tmpmem, OBJ_POINTER))) {
+			ao2_ref(mem, -1);
+		}
 		ao2_unlock(q);
 		queue_t_unref(q, "Expiring temporary reference.");
 	}

Modified: team/irroot/distrotech-customers-1.8/configs/queues.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/configs/queues.conf.sample?view=diff&rev=341633&r1=341632&r2=341633
==============================================================================
--- team/irroot/distrotech-customers-1.8/configs/queues.conf.sample (original)
+++ team/irroot/distrotech-customers-1.8/configs/queues.conf.sample Thu Oct 20 14:19:16 2011
@@ -70,6 +70,13 @@
 ; is set.  The default value (no) maintains backward compatibility.
 ;
 ;log_membername_as_agent = no
+;
+; app_queue allows calls to members in a "Unknown" state to be treated as available
+; setting check_state_unknown = yes will cause app_queue to query the channel driver
+; to better determine the state this only applies to queues with ringinuse or ignorebusy
+; set appropriately. 
+;
+;check_state_unknown = no
 ;
 ;[markq]
 ;
@@ -209,6 +216,16 @@
 ; Autopausedelay delay autopause for autopausedelay seconds from the
 ; last call if a member has not taken a call the delay has no effect.
 ;autopausedelay=60
+;
+; Autopausebusy controls whether or not a queue member is set as paused
+; automatically upon the member device reporting busy. The autopausedelay
+; option applies. Defaults to 'no'.
+;autopausebusy=no
+;
+; Autopauseunavail controls whether or not a queue member is set as paused
+; automatically upon the member device reporting congestion. The autopausedely
+; option applies. Defaults to 'no'.
+;autopauseunavail=no
 ;
 ; Maximum number of people waiting in the queue (0 for unlimited)
 ;