1
0
Fork 0

*** empty log message ***

This commit is contained in:
bagyenda 2009-05-06 05:38:41 +00:00
parent e35d2ffa26
commit 5fcfe061af
7 changed files with 35 additions and 2 deletions

View File

@ -1,5 +1,6 @@
2009-05-05 P. A. Bagyenda <bagyenda@dsmagic.com>
* MMSC fix: don't send subject in notification if size optimisation turned on
* Added mm1-queue-run-interval config option, so that MM1 queue can be processed at different interval
2009-03-28 P. A. Bagyenda <bagyenda@dsmagic.com>
* Improved pgsql-queue module: re-connect to db if connections die, only allocate as many connections as needed
2009-03-05 P. A. Bagyenda <bagyenda@dsmagic.com>

View File

@ -17,6 +17,7 @@ default-message-expiry = 360000
max-message-expiry = 720000
mmsc-services = Relay,MM1
queue-run-interval = 5
mm1-queue-run-interval = 300
send-attempt-back-off = 300
sendsms-url = http://localhost:13013/cgi-bin/sendsms
sendsms-username = tester

View File

@ -996,6 +996,29 @@ lists all the configuration directives. The column <b>Mode</b>
seconds between each queue run
&nbsp; &nbsp;</td>
</tr>
<tr>
<td valign=top >
<tt>mm1-queue-run-interval</tt>
&nbsp; &nbsp;</td>
<td valign=top >
<i>MMSC</i>
&nbsp; &nbsp;
</td>
<td valign=top >
Real
&nbsp; &nbsp;</td>
<td valign=top >
How many
seconds between each queue run for the MM1 queue. Defaults to the
value given above (<tt>queue-run-interval</tt>)
&nbsp; &nbsp;</td>
</tr>
<tr>
<td valign=top >
<tt>queue-manager-module</tt>

View File

@ -65,6 +65,7 @@ SINGLE_GROUP(mbuni,
OCTSTR(default-message-expiry)
OCTSTR(max-message-expiry)
OCTSTR(queue-run-interval)
OCTSTR(mm1-queue-run-interval)
OCTSTR(send-attempt-back-off)
OCTSTR(sendsms-url)
OCTSTR(sendsms-username)

View File

@ -213,6 +213,13 @@ MmscSettings *mms_load_mmsc_settings(Octstr *fname, List **proxyrelays, int skip
octstr_destroy(s);
s = _mms_cfg_getx(cfg, grp, octstr_imm("mm1-queue-run-interval"));
if (!s || (m->mm1_queue_interval = atof(octstr_get_cstr(s))) <= 0)
m->mm1_queue_interval = m->queue_interval;
octstr_destroy(s);
if (mms_cfg_get_int(cfg, grp, octstr_imm("send-attempt-back-off"), &m->send_back_off) == -1)
m->send_back_off = BACKOFF_FACTOR;

View File

@ -71,7 +71,7 @@ typedef struct MmscSettings {
long maxsendattempts;
long default_msgexpiry;
long max_msgexpiry;
double queue_interval;
double queue_interval, mm1_queue_interval;
long send_back_off;
long port, mm7port;

View File

@ -413,7 +413,7 @@ static int sendNotify(MmsEnvelope *e)
void mbuni_mm1_queue_runner(int *rstop)
{
settings->qfs->mms_queue_run(octstr_get_cstr(settings->mm1_queuedir),
sendNotify, settings->queue_interval, settings->maxthreads, rstop);
sendNotify, settings->mm1_queue_interval, settings->maxthreads, rstop);
gwthread_sleep(2); /* Wait for it to die. */
return;
}