Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 7908 via svnmerge from

Browse Source 
/branches/1.2


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7909 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Tilghman Lesher 20 years ago
parent 99a3195329
commit 335cd7d3a2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File

3
pbx/pbx_spool.c
Unescape View File

@ -312,8 +312,10 @@ static int scan_service(char *fn, time_t now, time_t atime)
#endif #endif
fclose(f); fclose(f);
if (o->retries <= o->maxretries) { if (o->retries <= o->maxretries) {
now += o->retrytime;
if (o->callingpid && (o->callingpid == ast_mainpid)) { if (o->callingpid && (o->callingpid == ast_mainpid)) {
safe_append(o, time(NULL), "DelayedRetry"); safe_append(o, time(NULL), "DelayedRetry");
free_outgoing(o);
ast_log(LOG_DEBUG, "Delaying retry since we're currently running '%s'\n", o->fn); ast_log(LOG_DEBUG, "Delaying retry since we're currently running '%s'\n", o->fn);
} else { } else {
/* Increment retries */ /* Increment retries */
@ -326,7 +328,6 @@ static int scan_service(char *fn, time_t now, time_t atime)
safe_append(o, now, "StartRetry"); safe_append(o, now, "StartRetry");
launch_service(o); launch_service(o);
} }
now += o->retrytime;
return now; return now;
} else { } 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" : ""); 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" : "");

Write Preview
Loading…
Cancel
Save