aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-02-20 22:32:22 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-02-20 22:32:22 +0000
commitd23390781a30e6f6e50bf027f3a65f757bd5700b (patch)
tree0859aeaa07a687f56141e07fedc17c6fc8e8eec1 /apps
parent2c4d2bb2420f321dffb71ee7fda0b01bd6f2e3a2 (diff)
Clear up confusion when viewing the QUEUE_WAITING_COUNT of a
"dead" realtime queue. Since from the user's perspective, the queue does exist, we shouldn't tell them we couldn't find the queue. Instead since it is a dead queue, report a 0 waiting count This issue was brought up on IRC by jmls git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@103956 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 0374575ec..f8ef4cb2d 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -4002,6 +4002,7 @@ static int queue_function_queuewaitingcount(struct ast_channel *chan, char *cmd,
int count = 0;
struct call_queue *q;
struct ast_module_user *lu;
+ struct ast_variable *var = NULL;
buf[0] = '\0';
@@ -4024,6 +4025,13 @@ static int queue_function_queuewaitingcount(struct ast_channel *chan, char *cmd,
if (q) {
count = q->count;
ast_mutex_unlock(&q->lock);
+ } else if ((var = ast_load_realtime("queues", "name", data, NULL))) {
+ /* if the queue is realtime but was not found in memory, this
+ * means that the queue had been deleted from memory since it was
+ * "dead." This means it has a 0 waiting count
+ */
+ count = 0;
+ ast_variables_destroy(var);
} else
ast_log(LOG_WARNING, "queue %s was not found\n", data);