Merged revisions 7908 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 9 Jan 2006 20:12:07 +0000 (20:12 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 9 Jan 2006 20:12:07 +0000 (20:12 +0000)
/branches/1.2

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7909 65c4cc65-6c06-0410-ace0-fbb531ad65f3

pbx/pbx_spool.c

index 5d65c6d..2fa6f5f 100644 (file)
@@ -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" : "");