summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2015-12-03 12:38:28 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2015-12-03 12:38:28 -0600
commitf474f92d6ae4beb77e591e7292b7a723308f24a0 (patch)
tree822d5146073f398c3740a02bfd555393b9bd8301
parent75a0062d7268c6ec2d334d79bd9a30a64394cf71 (diff)
parentf2a84b500d0706ce411940e72562118c263ab9be (diff)
Merge "app_queue: Show reason of pause on CLI"
-rw-r--r--apps/app_queue.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 234543f75..a2ed2c924 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
- * Copyright (C) 1999 - 2006, Digium, Inc.
+ * Copyright (C) 1999 - 2015, Digium, Inc.
*
* Mark Spencer <markster@digium.com>
*
@@ -9250,10 +9250,20 @@ static char *__queues_show(struct mansession *s, int fd, int argc, const char *
ast_str_append(&out, 0, " (ringinuse %s)", mem->ringinuse ? "enabled" : "disabled");
- ast_str_append(&out, 0, "%s%s%s%s%s%s%s%s%s (%s%s%s)",
+ ast_str_append(&out, 0, "%s%s%s%s%s%s",
mem->dynamic ? ast_term_color(COLOR_CYAN, COLOR_BLACK) : "", mem->dynamic ? " (dynamic)" : "", ast_term_reset(),
- mem->realtime ? ast_term_color(COLOR_MAGENTA, COLOR_BLACK) : "", mem->realtime ? " (realtime)" : "", ast_term_reset(),
- mem->paused ? ast_term_color(COLOR_BROWN, COLOR_BLACK) : "", mem->paused ? " (paused)" : "", ast_term_reset(),
+ mem->realtime ? ast_term_color(COLOR_MAGENTA, COLOR_BLACK) : "", mem->realtime ? " (realtime)" : "", ast_term_reset());
+ if (mem->paused) {
+ if (ast_strlen_zero(mem->reason_paused)) {
+ ast_str_append(&out, 0, " %s(paused)%s",
+ ast_term_color(COLOR_BROWN, COLOR_BLACK), ast_term_reset());
+ } else {
+ ast_str_append(&out, 0, " %s(paused:%s)%s", ast_term_color(COLOR_BROWN, COLOR_BLACK),
+ mem->reason_paused, ast_term_reset());
+ }
+ }
+
+ ast_str_append(&out, 0, " (%s%s%s)",
ast_term_color(
mem->status == AST_DEVICE_UNAVAILABLE || mem->status == AST_DEVICE_UNKNOWN ?
COLOR_RED : COLOR_GREEN, COLOR_BLACK),