*** empty log message ***
This commit is contained in:
parent
6b35184a7e
commit
3d663b90a9
|
@ -2,6 +2,8 @@
|
||||||
* MMSC fix: don't send subject in notification if size optimisation turned on
|
* 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
|
* Added mm1-queue-run-interval config option, so that MM1 queue can be processed at different interval
|
||||||
* Fixed: When MM1 notification attempts exceed maximum, do not delete message, rather wait for expiry
|
* Fixed: When MM1 notification attempts exceed maximum, do not delete message, rather wait for expiry
|
||||||
|
* Added mm1-maximum-notify-attempts config option, so that number of MM1 notifications can be controlled
|
||||||
|
separately from other delivery attempts
|
||||||
2009-03-28 P. A. Bagyenda <bagyenda@dsmagic.com>
|
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
|
* 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>
|
2009-03-05 P. A. Bagyenda <bagyenda@dsmagic.com>
|
||||||
|
|
|
@ -13,6 +13,7 @@ max-send-threads = 5
|
||||||
send-mail-prog = /usr/sbin/sendmail -f '%f' '%t'
|
send-mail-prog = /usr/sbin/sendmail -f '%f' '%t'
|
||||||
unified-prefix = "+25637,037,37"
|
unified-prefix = "+25637,037,37"
|
||||||
maximum-send-attempts = 50
|
maximum-send-attempts = 50
|
||||||
|
mm1-maximum-notify-attempts = 1
|
||||||
default-message-expiry = 360000
|
default-message-expiry = 360000
|
||||||
max-message-expiry = 720000
|
max-message-expiry = 720000
|
||||||
mmsc-services = Relay,MM1
|
mmsc-services = Relay,MM1
|
||||||
|
|
|
@ -936,6 +936,30 @@ lists all the configuration directives. The column <b>Mode</b>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td valign=top >
|
||||||
|
<tt>mm1-maximum-notify-attempts
|
||||||
|
</tt>
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td valign=top >
|
||||||
|
<i>MMSC</i>
|
||||||
|
|
||||||
|
</td>
|
||||||
|
|
||||||
|
<td valign=top >
|
||||||
|
integer
|
||||||
|
</td>
|
||||||
|
<td valign=top >
|
||||||
|
Maximum number
|
||||||
|
of attempts gateway must make to notify a device of a pending
|
||||||
|
message on the MM1 interface, before giving up. Defaults to <tt>maximum-send-attempts</tt>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
|
||||||
<td valign=top >
|
<td valign=top >
|
||||||
<tt>default-message-expiry</tt>
|
<tt>default-message-expiry</tt>
|
||||||
|
|
||||||
|
|
|
@ -62,6 +62,7 @@ SINGLE_GROUP(mbuni,
|
||||||
OCTSTR(unified-prefix)
|
OCTSTR(unified-prefix)
|
||||||
OCTSTR(strip-prefixes)
|
OCTSTR(strip-prefixes)
|
||||||
OCTSTR(maximum-send-attempts)
|
OCTSTR(maximum-send-attempts)
|
||||||
|
OCTSTR(mm1-maximum-notify-attempts)
|
||||||
OCTSTR(default-message-expiry)
|
OCTSTR(default-message-expiry)
|
||||||
OCTSTR(max-message-expiry)
|
OCTSTR(max-message-expiry)
|
||||||
OCTSTR(queue-run-interval)
|
OCTSTR(queue-run-interval)
|
||||||
|
|
|
@ -201,6 +201,9 @@ MmscSettings *mms_load_mmsc_settings(Octstr *fname, List **proxyrelays, int skip
|
||||||
if (mms_cfg_get_int(cfg, grp, octstr_imm("maximum-send-attempts"), &m->maxsendattempts) == -1)
|
if (mms_cfg_get_int(cfg, grp, octstr_imm("maximum-send-attempts"), &m->maxsendattempts) == -1)
|
||||||
m->maxsendattempts = MAXQTRIES;
|
m->maxsendattempts = MAXQTRIES;
|
||||||
|
|
||||||
|
if (mms_cfg_get_int(cfg, grp, octstr_imm("mm1-maximum-notify-attempts"), &m->mm1_maxsendattempts) == -1)
|
||||||
|
m->mm1_maxsendattempts = m->maxsendattempts;
|
||||||
|
|
||||||
if (mms_cfg_get_int(cfg, grp, octstr_imm("default-message-expiry"), &m->default_msgexpiry) == -1)
|
if (mms_cfg_get_int(cfg, grp, octstr_imm("default-message-expiry"), &m->default_msgexpiry) == -1)
|
||||||
m->default_msgexpiry = DEFAULT_EXPIRE;
|
m->default_msgexpiry = DEFAULT_EXPIRE;
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ typedef struct MmscSettings {
|
||||||
Octstr *ua_profile_cache_dir;
|
Octstr *ua_profile_cache_dir;
|
||||||
|
|
||||||
long maxthreads;
|
long maxthreads;
|
||||||
long maxsendattempts;
|
long maxsendattempts, mm1_maxsendattempts;
|
||||||
long default_msgexpiry;
|
long default_msgexpiry;
|
||||||
long max_msgexpiry;
|
long max_msgexpiry;
|
||||||
double queue_interval, mm1_queue_interval;
|
double queue_interval, mm1_queue_interval;
|
||||||
|
|
|
@ -180,7 +180,7 @@ static int sendNotify(MmsEnvelope *e)
|
||||||
prov_notify_event = "failedfetch";
|
prov_notify_event = "failedfetch";
|
||||||
rtype = "Expired";
|
rtype = "Expired";
|
||||||
goto done;
|
goto done;
|
||||||
} else if (e->attempts >= settings->maxsendattempts) {
|
} else if (e->attempts >= settings->mm1_maxsendattempts) {
|
||||||
err = octstr_format("MM1: Maximum delivery attempts [%d] to %S reached. Delivery suspended!",
|
err = octstr_format("MM1: Maximum delivery attempts [%d] to %S reached. Delivery suspended!",
|
||||||
e->attempts, to);
|
e->attempts, to);
|
||||||
res = MMS_SEND_OK;
|
res = MMS_SEND_OK;
|
||||||
|
|
Loading…
Reference in New Issue