[Asterisk-code-review] app_queue: (Breaking change) shared_lastcall and autofill default to ... (asterisk[13])
Walter Doekes
asteriskteam at digium.com
Mon Jun 15 07:37:29 CDT 2020
Walter Doekes has uploaded this change for review. ( https://gerrit.asterisk.org/c/asterisk/+/14564 )
Change subject: app_queue: (Breaking change) shared_lastcall and autofill default to 'no'
......................................................................
app_queue: (Breaking change) shared_lastcall and autofill default to 'no'
If your queues.conf had _no_ [general] section, they would default to
'yes'. Now, they always default to 'no'.
ASTERISK-28951
Change-Id: Ic39d8a0202906bc454194368bbfbae62990fe5f6
---
M apps/app_queue.c
M configs/samples/queues.conf.sample
A doc/UPGRADE-staging/app_queue_consistent_general.txt
3 files changed, 40 insertions(+), 23 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/64/14564/1
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 3a572ef..02db021 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1363,34 +1363,34 @@
static const char * const pm_family = "Queue/PersistentMembers";
/*! \brief queues.conf [general] option */
-static int queue_persistent_members = 0;
+static int queue_persistent_members;
-/*! \brief queues.conf per-queue weight option */
-static int use_weight = 0;
+/*! \brief Records that one or more queues use weight */
+static int use_weight;
/*! \brief queues.conf [general] option */
-static int autofill_default = 1;
+static int autofill_default;
/*! \brief queues.conf [general] option */
-static int montype_default = 0;
+static int montype_default;
/*! \brief queues.conf [general] option */
-static int shared_lastcall = 1;
+static int shared_lastcall;
/*! \brief queuesrules.conf [general] option */
-static int realtime_rules = 0;
+static int realtime_rules;
/*! \brief Subscription to device state change messages */
static struct stasis_subscription *device_state_sub;
/*! \brief queues.conf [general] option */
-static int update_cdr = 0;
+static int update_cdr;
/*! \brief queues.conf [general] option */
-static int negative_penalty_invalid = 0;
+static int negative_penalty_invalid;
/*! \brief queues.conf [general] option */
-static int log_membername_as_agent = 0;
+static int log_membername_as_agent;
/*! \brief name of the ringinuse field in the realtime database */
static char *realtime_ringinuse_field;
@@ -8722,14 +8722,19 @@
.write = queue_function_memberpenalty_write,
};
+/*! Reset the global queue rules parameters even if there is no "general" section of queuerules.conf */
+static void queue_rules_reset_global_params(void)
+{
+ realtime_rules = 0;
+}
+
/*! Set the global queue rules parameters as defined in the "general" section of queuerules.conf */
static void queue_rules_set_global_params(struct ast_config *cfg)
{
- const char *general_val = NULL;
- realtime_rules = 0;
- if ((general_val = ast_variable_retrieve(cfg, "general", "realtime_rules"))) {
- realtime_rules = ast_true(general_val);
- }
+ const char *general_val = NULL;
+ if ((general_val = ast_variable_retrieve(cfg, "general", "realtime_rules"))) {
+ realtime_rules = ast_true(general_val);
+ }
}
/*! \brief Reload the rules defined in queuerules.conf
@@ -8764,6 +8769,7 @@
ast_free(pr_iter);
ast_free(rl_iter);
}
+ queue_rules_reset_global_params();
while ((rulecat = ast_category_browse(cfg, rulecat))) {
if (!strcasecmp(rulecat, "general")) {
queue_rules_set_global_params(cfg);
@@ -8795,36 +8801,41 @@
return AST_MODULE_LOAD_SUCCESS;
}
+/*! Always set the global queue defaults, even if there is no "general" section in queues.conf */
+static void queue_reset_global_params(void)
+{
+ queue_persistent_members = 0;
+ autofill_default = 0;
+ montype_default = 0;
+ update_cdr = 0;
+ shared_lastcall = 0;
+ negative_penalty_invalid = 0;
+ log_membername_as_agent = 0;
+}
+
/*! Set the global queue parameters as defined in the "general" section of queues.conf */
static void queue_set_global_params(struct ast_config *cfg)
{
const char *general_val = NULL;
- queue_persistent_members = 0;
if ((general_val = ast_variable_retrieve(cfg, "general", "persistentmembers"))) {
queue_persistent_members = ast_true(general_val);
}
- autofill_default = 0;
if ((general_val = ast_variable_retrieve(cfg, "general", "autofill"))) {
autofill_default = ast_true(general_val);
}
- montype_default = 0;
if ((general_val = ast_variable_retrieve(cfg, "general", "monitor-type"))) {
if (!strcasecmp(general_val, "mixmonitor"))
montype_default = 1;
}
- update_cdr = 0;
if ((general_val = ast_variable_retrieve(cfg, "general", "updatecdr"))) {
update_cdr = ast_true(general_val);
}
- shared_lastcall = 0;
if ((general_val = ast_variable_retrieve(cfg, "general", "shared_lastcall"))) {
shared_lastcall = ast_true(general_val);
}
- negative_penalty_invalid = 0;
if ((general_val = ast_variable_retrieve(cfg, "general", "negative_penalty_invalid"))) {
negative_penalty_invalid = ast_true(general_val);
}
- log_membername_as_agent = 0;
if ((general_val = ast_variable_retrieve(cfg, "general", "log_membername_as_agent"))) {
log_membername_as_agent = ast_true(general_val);
}
@@ -9128,6 +9139,7 @@
/* Chug through config file. */
cat = NULL;
+ queue_reset_global_params();
while ((cat = ast_category_browse(cfg, cat)) ) {
if (!strcasecmp(cat, "general") && queue_reload) {
queue_set_global_params(cfg);
diff --git a/configs/samples/queues.conf.sample b/configs/samples/queues.conf.sample
index 5c8a80f..f169492 100644
--- a/configs/samples/queues.conf.sample
+++ b/configs/samples/queues.conf.sample
@@ -23,7 +23,7 @@
; no more available members or no more waiting callers. This is
; probably more along the lines of how a queue should work and
; in most cases, you will want to enable this behavior. If you
-; do not specify or comment out this option, it will default to yes.
+; do not specify or comment out this option, it will default to no.
;
;autofill = no
;
diff --git a/doc/UPGRADE-staging/app_queue_consistent_general.txt b/doc/UPGRADE-staging/app_queue_consistent_general.txt
new file mode 100644
index 0000000..544bbf0
--- /dev/null
+++ b/doc/UPGRADE-staging/app_queue_consistent_general.txt
@@ -0,0 +1,5 @@
+Subject: app_queue
+
+If they are not specified in [general], "shared_lastcall" and "autofill"
+now always default to OFF. Before this version, they would be off ('no') if
+queues.conf did not have a [general] section, but on ('yes') if it did.
--
To view, visit https://gerrit.asterisk.org/c/asterisk/+/14564
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Change-Id: Ic39d8a0202906bc454194368bbfbae62990fe5f6
Gerrit-Change-Number: 14564
Gerrit-PatchSet: 1
Gerrit-Owner: Walter Doekes <walter+asterisk at wjd.nu>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20200615/ab2777e9/attachment.html>
More information about the asterisk-code-review
mailing list