<p>Sean Bright has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/19885">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app_queue: Reset all queue defaults before reload.<br><br>Several queue fields were not being set to their default value during<br>a reload.<br><br>Additionally added some sample configuration options that were missing<br>from queues.conf.sample.<br><br>Change-Id: I3a88c7877af91752b1b46a0c087384f7eb9c47e4<br>---<br>M apps/app_queue.c<br>M configs/samples/queues.conf.sample<br>2 files changed, 33 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/85/19885/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_queue.c b/apps/app_queue.c</span><br><span>index 288c0ff..20bb1d8 100644</span><br><span>--- a/apps/app_queue.c</span><br><span>+++ b/apps/app_queue.c</span><br><span>@@ -2956,7 +2956,11 @@</span><br><span> q->timeout = DEFAULT_TIMEOUT;</span><br><span> q->maxlen = 0;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ast_string_field_set(q, announce, "");</span><br><span> ast_string_field_set(q, context, "");</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_string_field_set(q, membermacro, "");</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_string_field_set(q, membergosub, "");</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_string_field_set(q, defaultrule, "");</span><br><span> </span><br><span> q->announcefrequency = 0;</span><br><span> q->minannouncefrequency = DEFAULT_MIN_ANNOUNCE_FREQUENCY;</span><br><span>@@ -2985,7 +2989,10 @@</span><br><span> q->periodicannouncefrequency = 0;</span><br><span> q->randomperiodicannounce = 0;</span><br><span> q->numperiodicannounce = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ q->relativeperiodicannounce = 0;</span><br><span> q->autopause = QUEUE_AUTOPAUSE_OFF;</span><br><span style="color: hsl(120, 100%, 40%);">+ q->autopausebusy = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ q->autopauseunavail = 0;</span><br><span> q->timeoutpriority = TIMEOUT_PRIORITY_APP;</span><br><span> q->autopausedelay = 0;</span><br><span> if (!q->members) {</span><br><span>@@ -3010,6 +3017,7 @@</span><br><span> ast_string_field_set(q, sound_minute, "queue-minute");</span><br><span> ast_string_field_set(q, sound_seconds, "queue-seconds");</span><br><span> ast_string_field_set(q, sound_thanks, "queue-thankyou");</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_string_field_set(q, sound_callerannounce, "");</span><br><span> ast_string_field_set(q, sound_reporthold, "queue-reporthold");</span><br><span> </span><br><span> if (!q->sound_periodicannounce[0]) {</span><br><span>diff --git a/configs/samples/queues.conf.sample b/configs/samples/queues.conf.sample</span><br><span>index f40342e..fbb5653 100644</span><br><span>--- a/configs/samples/queues.conf.sample</span><br><span>+++ b/configs/samples/queues.conf.sample</span><br><span>@@ -78,6 +78,12 @@</span><br><span> ;</span><br><span> ;announce = queue-markq</span><br><span> ;</span><br><span style="color: hsl(120, 100%, 40%);">+; An announcement may be specified which is played to the caller just</span><br><span style="color: hsl(120, 100%, 40%);">+; before they are bridged with an agent. The default is to not play an</span><br><span style="color: hsl(120, 100%, 40%);">+; announcement to the caller.</span><br><span style="color: hsl(120, 100%, 40%);">+;</span><br><span style="color: hsl(120, 100%, 40%);">+;queue-callerannounce = you-are-being-connected</span><br><span style="color: hsl(120, 100%, 40%);">+;</span><br><span> ; A strategy may be specified. Valid strategies include:</span><br><span> ;</span><br><span> ; ringall - ring all available channels until one answers (default)</span><br><span>@@ -354,6 +360,10 @@</span><br><span> ;queue-thereare = queue-thereare</span><br><span> ; ("calls waiting.")</span><br><span> ;queue-callswaiting = queue-callswaiting</span><br><span style="color: hsl(120, 100%, 40%);">+ ; ("Currently there are more than")</span><br><span style="color: hsl(120, 100%, 40%);">+;queue-quantity1 = queue-quantity1</span><br><span style="color: hsl(120, 100%, 40%);">+ ; ("callers waiting to speak with a representative")</span><br><span style="color: hsl(120, 100%, 40%);">+;queue-quantity2 = queue-quantity2</span><br><span> ; ("The current est. holdtime is")</span><br><span> ;queue-holdtime = queue-holdtime</span><br><span> ; ("minute.")</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/19885">change 19885</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/19885"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: I3a88c7877af91752b1b46a0c087384f7eb9c47e4 </div>
<div style="display:none"> Gerrit-Change-Number: 19885 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean@seanbright.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>