diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-03 17:02:19 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-03 17:02:19 +0000 |
| commit | 3096b6cddd52b0e8c7f3ab86013f07b183193cd1 (patch) | |
| tree | f64c2fadcc0ec4b86bed78e2a41fd86c1ad8b154 /pbx/pbx_spool.c | |
| parent | cc3ed861e9632e9a3c3b6b22b2f294a0a3a3ef17 (diff) | |
Merged revisions 160552 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r160552 | tilghman | 2008-12-03 11:01:03 -0600 (Wed, 03 Dec 2008) | 11 lines
Merged revisions 160551 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r160551 | tilghman | 2008-12-03 10:58:34 -0600 (Wed, 03 Dec 2008) | 4 lines
Don't start scanning the directory until all modules are loaded, because some
required modules (channels, apps, functions) may not yet be in memory yet.
Fixes AST-149.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@160554 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx/pbx_spool.c')
| -rw-r--r-- | pbx/pbx_spool.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c index 26d38dfe5..1955b78a5 100644 --- a/pbx/pbx_spool.c +++ b/pbx/pbx_spool.c @@ -40,6 +40,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/pbx.h" #include "asterisk/module.h" #include "asterisk/utils.h" +#include "asterisk/options.h" /* * pbx_spool is similar in spirit to qcall, but with substantially enhanced functionality... @@ -432,10 +433,15 @@ static void *scan_thread(void *unused) char fn[256]; int res; time_t last = 0, next = 0, now; + struct timespec ts = { .tv_sec = 1 }; + + while (!ast_fully_booted) { + nanosleep(&ts, NULL); + } for(;;) { /* Wait a sec */ - sleep(1); + nanosleep(&ts, NULL); time(&now); if (stat(qdir, &st)) { |