diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-03 17:41:07 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-03 17:41:07 +0000 |
| commit | 3e55dd2bd0e5b5541366ad9bf503428ec8101fc3 (patch) | |
| tree | 655fb022294ed8804d892713f39858a0ce878ca9 /pbx | |
| parent | 24c72c5608eab8f03079c6e21494ef2590444194 (diff) | |
Merged revisions 160559 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r160559 | tilghman | 2008-12-03 11:38:59 -0600 (Wed, 03 Dec 2008) | 14 lines
Merged revisions 160558 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r160558 | tilghman | 2008-12-03 11:34:34 -0600 (Wed, 03 Dec 2008) | 7 lines
If an entry is added to the directory during a scan when another entry expires,
then that new entry will not be processed promptly, but must wait for either a
future entry to start or a current entry's retry to occur. If no other entries
exist in the directory (other than the new entries) when a bunch expire, then
the new entries must wait until another new entry is added to be processed.
This was a rather weird race condition, really. Fixes AST-147.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@160560 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/pbx_spool.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c index b295c22da..3f85c4c7b 100644 --- a/pbx/pbx_spool.c +++ b/pbx/pbx_spool.c @@ -465,7 +465,7 @@ static void *scan_thread(void *unused) #if 0 printf("atime: %ld, mtime: %ld, ctime: %ld\n", st.st_atime, st.st_mtime, st.st_ctime); printf("Ooh, something changed / timeout\n"); -#endif +#endif next = 0; last = st.st_mtime; @@ -489,8 +489,12 @@ static void *scan_thread(void *unused) if (!next || (res < next)) { next = res; } - } else if (res) + } else if (res) { ast_log(LOG_WARNING, "Failed to scan service '%s'\n", fn); + } else if (!next) { + /* Expired entry: must recheck on the next go-around */ + next = st.st_mtime; + } } else { /* Update "next" update if necessary */ if (!next || (st.st_mtime < next)) |