automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@45046 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/dnsmgr.c b/dnsmgr.c
index de832474177a9e19fc8e0880c5932c24116f115c..58381149058745ea8dfca4ac2011b5101b026ed0 100644 (file)
--- a/dnsmgr.c
+++ b/dnsmgr.c
@@ -147,7 +147,7 @@ static void *do_refresh(void *data)
 {
        for (;;) {
                pthread_testcancel();
-               usleep(ast_sched_wait(sched));
+               usleep((ast_sched_wait(sched)*1000));
                pthread_testcancel();
                ast_sched_runq(sched);
        }
@@ -339,16 +339,16 @@ static int do_reload(int loading)
 
        /* 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(&refresh_thread, NULL, do_refresh, NULL) < 0) {
-                       ast_log(LOG_ERROR, "Unable to start refresh thread.\n");
-               }
-               else {
+       if (enabled) {
+               if (!was_enabled && (refresh_thread == AST_PTHREADT_NULL)) {
+                       if (ast_pthread_create(&refresh_thread, NULL, do_refresh, NULL) < 0) {
+                               ast_log(LOG_ERROR, "Unable to start refresh thread.\n");
+                       }
                        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 */