diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2006-01-09 20:12:07 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2006-01-09 20:12:07 +0000 |
| commit | 335cd7d3a2957d6bf6dda810b2757a2b0fb66020 (patch) | |
| tree | 6b6dac3b240a970565e1b1b595d500cb4d2d2676 /pbx/pbx_spool.c | |
| parent | 99a3195329192e83b4b40a958624173ccab14202 (diff) | |
Merged revisions 7908 via svnmerge from
/branches/1.2
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7909 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx/pbx_spool.c')
| -rw-r--r-- | pbx/pbx_spool.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c index 5d65c6d3c..2fa6f5f52 100644 --- a/pbx/pbx_spool.c +++ b/pbx/pbx_spool.c @@ -312,8 +312,10 @@ static int scan_service(char *fn, time_t now, time_t atime) #endif fclose(f); if (o->retries <= o->maxretries) { + now += o->retrytime; if (o->callingpid && (o->callingpid == ast_mainpid)) { safe_append(o, time(NULL), "DelayedRetry"); + free_outgoing(o); ast_log(LOG_DEBUG, "Delaying retry since we're currently running '%s'\n", o->fn); } else { /* Increment retries */ @@ -326,7 +328,6 @@ static int scan_service(char *fn, time_t now, time_t atime) safe_append(o, now, "StartRetry"); launch_service(o); } - now += o->retrytime; return now; } else { ast_log(LOG_EVENT, "Queued call to %s/%s expired without completion after %d attempt%s\n", o->tech, o->dest, o->retries - 1, ((o->retries - 1) != 1) ? "s" : ""); |