[asterisk-commits] file: trunk r45032 - in /trunk: ./ main/dnsmgr.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Fri Oct 13 10:56:17 2006
New Revision: 45032

URL: http://svn.digium.com/view/asterisk?rev=45032&view=rev
Log:
Merged revisions 45031 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r45031 | file | 2006-10-13 11:53:22 -0400 (Fri, 13 Oct 2006) | 10 lines

Merged revisions 45030 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r45030 | file | 2006-10-13 11:49:53 -0400 (Fri, 13 Oct 2006) | 2 lines

Pass the right value to usleep for sleeping, and always add the background refresh item back into the scheduler if enabled since it is deleted during reload. (issue #8142 reported by p_lindheimer)

........

................

Modified:
    trunk/   (props changed)
    trunk/main/dnsmgr.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/dnsmgr.c
URL: http://svn.digium.com/view/asterisk/trunk/main/dnsmgr.c?rev=45032&r1=45031&r2=45032&view=diff
==============================================================================
--- trunk/main/dnsmgr.c (original)
+++ trunk/main/dnsmgr.c Fri Oct 13 10:56:17 2006
@@ -212,7 +212,7 @@
 {
 	for (;;) {
 		pthread_testcancel();
-		usleep(ast_sched_wait(sched));
+		usleep((ast_sched_wait(sched)*1000));
 		pthread_testcancel();
 		ast_sched_runq(sched);
 	}
@@ -389,16 +389,16 @@
 
 	/* if this reload enabled the manager, create the background thread
 	   if it does not exist */
-	if (enabled && !was_enabled && (refresh_thread == AST_PTHREADT_NULL)) {
-		if (ast_pthread_create_background(&refresh_thread, NULL, do_refresh, NULL) < 0) {
-			ast_log(LOG_ERROR, "Unable to start refresh thread.\n");
+	if (enabled) {
+		if (!was_enabled && (refresh_thread == AST_PTHREADT_NULL)) {
+			if (ast_pthread_create_background(&refresh_thread, NULL, do_refresh, NULL) < 0) {
+				ast_log(LOG_ERROR, "Unable to start refresh thread.\n");
+			}
+			ast_cli_register(&cli_refresh);
 		}
-		else {
-			ast_cli_register(&cli_refresh);
-			/* make a background refresh happen right away */
-			refresh_sched = ast_sched_add_variable(sched, 100, refresh_list, &master_refresh_info, 1);
-			res = 0;
-		}
+		/* make a background refresh happen right away */
+		refresh_sched = ast_sched_add_variable(sched, 100, refresh_list, &master_refresh_info, 1);
+		res = 0;
 	}
 	/* if this reload disabled the manager and there is a background thread,
 	   kill it */