From 335cd7d3a2957d6bf6dda810b2757a2b0fb66020 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 9 Jan 2006 20:12:07 +0000
Subject: [PATCH] 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
---
pbx/pbx_spool.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index 5d65c6d3cc..2fa6f5f523 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" : "");
--
GitLab