Merged revisions 163873 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r163873 | twilson | 2008-12-12 17:48:26 -0600 (Fri, 12 Dec 2008) | 6 lines

  When using realtime queues, app_queue wasn't updating the strategy if it was changed in the realtime backend.  This patch resolves the issue for almost all situations.  It is currently not supported to switch to the linear strategy via realtime since the ao2_container for members will have been set to have multiple buckets and therefore the members would be unordered.

  (closes issue #14034)
  Reported by: cristiandimache
  Tested by: otherwiseguy, cristiandimache
........

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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index c7003fa5edf4b3c16448795fd41904f7eed3669f..8e16ad339e6b113af13c290427dc6c3ae18bd18e 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1278,8 +1278,26 @@ static void queue_set_param(struct call_queue *q, const char *param, const char
        } else if (!strcasecmp(param, "servicelevel")) {
                q->servicelevel= atoi(val);
        } else if (!strcasecmp(param, "strategy")) {
-               /* We already have set this, no need to do it again */
-               return;
+               int strategy;
+
+               /* We are a static queue and already have set this, no need to do it again */
+               if (failunknown) {
+                       return;
+               }
+               strategy = strat2int(val);
+               if (strategy < 0) {
+                       ast_log(LOG_WARNING, "'%s' isn't a valid strategy for queue '%s', using ringall instead\n",
+                               val, q->name);
+                       q->strategy = QUEUE_STRATEGY_RINGALL;
+               }
+               if (strategy == q->strategy) {
+                       return;
+               }
+               if (strategy == QUEUE_STRATEGY_LINEAR) {
+                       ast_log(LOG_WARNING, "Changing to the linear strategy currently requires asterisk to be restarted.\n");
+                       return;
+               }
+               q->strategy = strategy;
        } else if (!strcasecmp(param, "joinempty")) {
                if (!strcasecmp(val, "loose"))
                        q->joinempty = QUEUE_EMPTY_LOOSE;