diff options
Diffstat (limited to 'server/server/config.cpp')
| -rwxr-xr-x | server/server/config.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp index 98db729..40ff3fb 100755 --- a/server/server/config.cpp +++ b/server/server/config.cpp @@ -4,11 +4,9 @@ extern logtofile *logger; void reload_config_thread_func(config *cfg, boost::mutex *lists_mutex) { + boost::this_thread::sleep(boost::posix_time::seconds(cfg->config_reload_interval())); while(!boost::this_thread::interruption_requested()) { - boost::this_thread::sleep(boost::posix_time::seconds(cfg->config_reload_interval())); - if(boost::this_thread::interruption_requested()) - return; lists_mutex->lock(); cfg->load_vars(); cfg->load_cvars(); @@ -19,6 +17,7 @@ void reload_config_thread_func(config *cfg, boost::mutex *lists_mutex) cfg->load_upload_list(); cfg->load_servers_list(); lists_mutex->unlock(); + boost::this_thread::sleep(boost::posix_time::seconds(cfg->config_reload_interval())); } } @@ -29,7 +28,7 @@ void speed_test_thread_func(config *cfg, int check_interval, std::list<config::p std::list<config::static_proxy_entry> tmp_list = *static_proxy_list; for(std::list<config::static_proxy_entry>::iterator i = tmp_list.begin(), end = tmp_list.end(); i != end; ++i) { - speedtest t(test_url); + speedtest t(test_url, *cfg); size_t sp = t.test(&(*i)); lists_mutex->lock(); std::list<config::static_proxy_entry>::iterator it = std::find(static_proxy_list->begin(), static_proxy_list->end(), *i); @@ -48,7 +47,7 @@ void speed_test_thread_func(config *cfg, int check_interval, std::list<config::p while(!logger) boost::this_thread::sleep(boost::posix_time::milliseconds(200)); logger->lock(); - *logger << time_str() << ": "<<i->host<<":"<<i->port<<"\t"<<sp<<"\n"; + *logger << time_str() << ": proxy "<<i->host<<":"<<i->port<<"\t speed "<<sp<<" (in speed_test_thread)\n"; logger->unlock(); } lists_mutex->unlock(); |