[svn-commits] tilghman: branch 1.6.0 r160553 - in /branches/1.6.0: ./ pbx/pbx_spool.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Dec  3 11:01:47 2008
New Revision: 160553

URL: http://svn.digium.com/view/asterisk?view=rev&rev=160553
Log:
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.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/pbx/pbx_spool.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/pbx/pbx_spool.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/pbx/pbx_spool.c?view=diff&rev=160553&r1=160552&r2=160553
==============================================================================
--- branches/1.6.0/pbx/pbx_spool.c (original)
+++ branches/1.6.0/pbx/pbx_spool.c Wed Dec  3 11:01:47 2008
@@ -40,6 +40,7 @@
 #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 @@
 	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)) {