hwelte
/
mbuni
1
0
Fork 0
Code Releases Activity

*** empty log message ***

This commit is contained in:
bagyenda 2009-05-06 07:24:57 +00:00
parent 1db281efec
commit 6b35184a7e
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mbuni/ChangeLog
View File

@ -1,6 +1,7 @@
2009-05-05 P. A. Bagyenda <bagyenda@dsmagic.com> 2009-05-05 P. A. Bagyenda <bagyenda@dsmagic.com>
* 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
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>

20
mbuni/mmsc/mmsmobilesender.c
View File

@ -175,19 +175,22 @@ static int sendNotify(MmsEnvelope *e)
if (e->expiryt != 0 && /* Handle message expiry. */ if (e->expiryt != 0 && /* Handle message expiry. */
e->expiryt < tnow) { e->expiryt < tnow) {
err = octstr_format("MMSC error: Message expired while sending to %S!", to); err = octstr_format("MM1 error: Message expired while sending to %S!", to);
res = MMS_SEND_ERROR_FATAL; res = MMS_SEND_ERROR_FATAL;
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->maxsendattempts) {
err = octstr_format("MMSC error: Failed to deliver to %S after %ld attempts!", err = octstr_format("MM1: Maximum delivery attempts [%d] to %S reached. Delivery suspended!",
to, e->attempts); e->attempts, to);
res = MMS_SEND_ERROR_FATAL; res = MMS_SEND_OK;
prov_notify_event = "failedfetch"; e->sendt = e->expiryt + 1; /* no retry until expiry */
rtype = "Expired"; if (settings->qfs->mms_queue_update(e) != 1)
settings->qfs->mms_queue_free_env(e);
e = NULL;
goto done; goto done;
} else if (e->lastaccess != 0) { } else if (e->lastaccess != 0) {
e->sendt = e->expiryt + 1; e->sendt = e->expiryt + 1;
res = MMS_SEND_OK; res = MMS_SEND_OK;
@ -367,8 +370,9 @@ static int sendNotify(MmsEnvelope *e)
(int)(time(NULL) - tnow)); (int)(time(NULL) - tnow));
if (res == MMS_SEND_ERROR_FATAL && xto && e) { if (xto && e) {
xto->process = 0; /* No more attempts to deliver, delete this. */ if (res == MMS_SEND_ERROR_FATAL)
xto->process = 0; /* No more attempts to deliver, delete this. */
if (settings->qfs->mms_queue_update(e) == 1) if (settings->qfs->mms_queue_update(e) == 1)
e = NULL; /* Queue entry gone. */ e = NULL; /* Queue entry gone. */
else else