Merge pull request #586 from cdjingit/consul_ns_fix_caidaojin

bug fix: consul ns thread can not quit

src/brpc/policy/consul_naming_service.cpp

@@ -214,6 +214,10 @@ int ConsulNamingService::RunNamingService(const char* service_name,
     for (;;) {
         servers.clear();
         const int rc = GetServers(service_name, &servers);
+        if (bthread_stopped(bthread_self())) {
+            RPC_VLOG << "Quit NamingServiceThread=" << bthread_self();
+            return 0;
+        }
         if (rc == 0) {
             ever_reset = true;
             actions->ResetServers(servers);
@@ -225,7 +229,7 @@ int ConsulNamingService::RunNamingService(const char* service_name,
                 servers.clear();
                 actions->ResetServers(servers);
             }
-            if (bthread_usleep(std::max(FLAGS_consul_retry_interval_ms, 1) * butil::Time::kMillisecondsPerSecond) < 0) {
+            if (bthread_usleep(std::max(FLAGS_consul_retry_interval_ms, 1) * butil::Time::kMicrosecondsPerMillisecond) < 0) {
                 if (errno == ESTOP) {
                     RPC_VLOG << "Quit NamingServiceThread=" << bthread_self();
                     return 0;