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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@160553 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Tilghman Lesher 17 years ago
parent 2c371ff2b7
commit e8a9aba72b

@ -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...
@ -441,10 +442,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)) {

Loading…
Cancel
Save