<p> Attention is currently required from: George Joseph, Benjamin Keith Ford, Jaco Kroon. </p>
<p>Joshua Colp would like George Joseph, Friendly Automation, Benjamin Keith Ford and Jaco Kroon to <strong>review</strong> this change.
</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/20060">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "app_queue: periodic announcement configurable start time."<br><br>This reverts commit c405630810bd92ac27d7618d3470dbac11aecced.<br><br>Reason for revert: Causes segmentation fault.<br><br>Change-Id: Ib0c8c592f8d4f0a5e3889aeadfe8bdcde800ba42<br>---<br>M apps/app_queue.c<br>M configs/samples/queues.conf.sample<br>D doc/CHANGES-staging/app_queue.txt<br>3 files changed, 13 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/60/20060/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 d2de993..f549af7 100644</span><br><span>--- a/apps/app_queue.c</span><br><span>+++ b/apps/app_queue.c</span><br><span>@@ -1856,7 +1856,6 @@</span><br><span> int announcepositionlimit; /*!< How many positions we announce? */</span><br><span> int announcefrequency; /*!< How often to announce their position */</span><br><span> int minannouncefrequency; /*!< The minimum number of seconds between position announcements (def. 15) */</span><br><span style="color: hsl(0, 100%, 40%);">- int periodicannouncestartdelay; /*!< How long into the queue should the periodic accouncement start */</span><br><span> int periodicannouncefrequency; /*!< How often to play periodic announcement */</span><br><span> int numperiodicannounce; /*!< The number of periodic announcements configured */</span><br><span> int randomperiodicannounce; /*!< Are periodic announcments randomly chosen */</span><br><span>@@ -2988,7 +2987,6 @@</span><br><span> q->weight = 0;</span><br><span> q->timeoutrestart = 0;</span><br><span> q->periodicannouncefrequency = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- q->periodicannouncestartdelay = -1;</span><br><span> q->randomperiodicannounce = 0;</span><br><span> q->numperiodicannounce = 0;</span><br><span> q->relativeperiodicannounce = 0;</span><br><span>@@ -3447,8 +3445,6 @@</span><br><span> ast_str_set(&q->sound_periodicannounce[0], 0, "%s", val);</span><br><span> q->numperiodicannounce = 1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (!strcasecmp(param, "periodic-announce-startdelay")) {</span><br><span style="color: hsl(0, 100%, 40%);">- q->periodicannouncestartdelay = atoi(val);</span><br><span> } else if (!strcasecmp(param, "periodic-announce-frequency")) {</span><br><span> q->periodicannouncefrequency = atoi(val);</span><br><span> } else if (!strcasecmp(param, "relative-periodic-announce")) {</span><br><span>@@ -8617,10 +8613,6 @@</span><br><span> qe.last_pos_said = 0;</span><br><span> qe.last_pos = 0;</span><br><span> qe.last_periodic_announce_time = time(NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- if (qe.parent->periodicannouncestartdelay >= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- qe.last_periodic_announce_time += qe.parent->periodicannouncestartdelay;</span><br><span style="color: hsl(0, 100%, 40%);">- qe.last_periodic_announce_time -= qe.parent->periodicannouncefrequency;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> qe.last_periodic_announce_sound = 0;</span><br><span> qe.valid_digits = 0;</span><br><span> if (join_queue(args.queuename, &qe, &reason, position)) {</span><br><span>diff --git a/configs/samples/queues.conf.sample b/configs/samples/queues.conf.sample</span><br><span>index d8308ca..fbb5653 100644</span><br><span>--- a/configs/samples/queues.conf.sample</span><br><span>+++ b/configs/samples/queues.conf.sample</span><br><span>@@ -291,13 +291,6 @@</span><br><span> ;</span><br><span> ;periodic-announce-frequency=60</span><br><span> ;</span><br><span style="color: hsl(0, 100%, 40%);">-; If given indicates the number of seconds after entering the queue the first</span><br><span style="color: hsl(0, 100%, 40%);">-; periodic announcement should be played. The default (and historic) behavior</span><br><span style="color: hsl(0, 100%, 40%);">-; is to play the first periodic announcement at periodic-announce-frequency</span><br><span style="color: hsl(0, 100%, 40%);">-; seconds after entering the queue.</span><br><span style="color: hsl(0, 100%, 40%);">-;</span><br><span style="color: hsl(0, 100%, 40%);">-;periodic-announce-startdelay=10</span><br><span style="color: hsl(0, 100%, 40%);">-;</span><br><span> ; Should the periodic announcements be played in a random order? Default is no.</span><br><span> ;</span><br><span> ;random-periodic-announce=no</span><br><span>diff --git a/doc/CHANGES-staging/app_queue.txt b/doc/CHANGES-staging/app_queue.txt</span><br><span>deleted file mode 100644</span><br><span>index f71bcb0..0000000</span><br><span>--- a/doc/CHANGES-staging/app_queue.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,9 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: app_queue</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Introduce a new queue configuration option called</span><br><span style="color: hsl(0, 100%, 40%);">-'periodic-announce-startdelay' which will vary the normal (historic) behavior</span><br><span style="color: hsl(0, 100%, 40%);">-of starting the periodic announcement cycle at periodic-announce-frequency</span><br><span style="color: hsl(0, 100%, 40%);">-seconds after entering the queue to start the periodic announcement cycle at</span><br><span style="color: hsl(0, 100%, 40%);">-period-announce-startdelay seconds after joining the queue.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-The default behavior if this config option is not set remains unchanged.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/20060">change 20060</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/+/20060"/><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: Ib0c8c592f8d4f0a5e3889aeadfe8bdcde800ba42 </div>
<div style="display:none"> Gerrit-Change-Number: 20060 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jaco Kroon <jaco@uls.co.za> </div>
<div style="display:none"> Gerrit-Attention: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Attention: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Attention: Jaco Kroon <jaco@uls.co.za> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>