officially deprecate the 'roundrobin' queue strategy in favor of 'rrmemory'

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30837 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/UPGRADE.txt b/UPGRADE.txt
index e4434142638a51c75085f49edacd881b93369e75..b9c238f79470c9c1415d756a25f128e818a70416 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -119,6 +119,11 @@ Applications:
   record conversations queue members are having with queue callers. Please
   see configs/queues.conf.sample for more information on this option.
 
+* The app_queue application strategy called 'roundrobin' has been deprecated
+  for this release. Users are encouraged to use 'rrmemory' instead, since it
+  provides more 'true' round-robin call delivery. For the Asterisk 1.6 release,
+  'rrmemory' will be renamed 'roundrobin'.
+
 * app_meetme: The 'm' option (monitor) is renamed to 'l' (listen only), and
   the 'm' option now provides the functionality of "initially muted". 
   In practice, most existing dialplans using the 'm' flag should not notice

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 5187800e95ff3f769fbe1da61ee8f989b1064a85..ba3940e48dc5011fef85b28ca541a599161d4406 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -395,6 +395,16 @@ static AST_LIST_HEAD_STATIC(queues, ast_call_queue);
 
 static int set_member_paused(char *queuename, char *interface, int paused);
 
+static void rr_dep_warning(void)
+{
+       static unsigned int warned = 0;
+
+       if (!warned) {
+               ast_log(LOG_NOTICE, "The 'roundrobin' queue strategy is deprecated. Please use the 'rrmemory' strategy instead.\n");
+               warned = 1;
+       }
+}
+
 static void set_queue_result(struct ast_channel *chan, enum queue_result res)
 {
        int i;
@@ -1028,6 +1038,9 @@ static struct ast_call_queue *find_queue_by_name_rt(const char *queuename, struc
                v = v->next;
        }
 
+       if (q->strategy == QUEUE_STRATEGY_ROUNDROBIN)
+               rr_dep_warning();
+
        /* Temporarily set non-dynamic members dead so we can detect deleted ones. */
        m = q->members;
        while (m) {
@@ -3692,6 +3705,9 @@ static void reload_queues(void)
                                        }
                                }
 
+                               if (q->strategy == QUEUE_STRATEGY_ROUNDROBIN)
+                                       rr_dep_warning();
+
                                if (new) {
                                        AST_LIST_INSERT_HEAD(&queues, q, list);
                                } else