diff options
Diffstat (limited to 'server/server/config.cpp')
| -rwxr-xr-x | server/server/config.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp index abfa11d..e7cfe98 100755 --- a/server/server/config.cpp +++ b/server/server/config.cpp @@ -20,7 +20,7 @@ void reload_config_thread_func(config *cfg, boost::mutex *m) } } -void speed_test_thread_func(std::list<config::proxy_entry>* proxy_list, std::list<config::static_proxy_entry> *static_proxy_list, const std::string& test_url, boost::mutex *m) +void speed_test_thread_func(int check_interval, std::list<config::proxy_entry>* proxy_list, std::list<config::static_proxy_entry> *static_proxy_list, const std::string& test_url, boost::mutex *m) { while(!boost::this_thread::interruption_requested()) { @@ -31,18 +31,18 @@ void speed_test_thread_func(std::list<config::proxy_entry>* proxy_list, std::lis speedtest t(test_url); //*l<<i->host<<" "<<(int)t.test(&(*i))<<"\n"; t.test(&(*i)); - boost::this_thread::sleep(boost::posix_time::seconds(2)); + boost::this_thread::sleep(boost::posix_time::seconds(1)); } /* for(std::list<config::proxy_entry>::iterator i = proxy_list->begin(), end = proxy_list->end(); i != end; ++i) { speedtest t(test_url); //*l<<i->host<<" "<<(int)t.test(&(*i))<<"\n"; t.test(&(*i)); - boost::this_thread::sleep(boost::posix_time::seconds(2)); + boost::this_thread::sleep(boost::posix_time::seconds(1)); } */ // delete l; m->unlock(); - boost::this_thread::sleep(boost::posix_time::minutes(180)); + boost::this_thread::sleep(boost::posix_time::seconds(check_interval)); } } @@ -114,7 +114,7 @@ config::config(const char *pth): cfg_reload_thr(NULL), speed_test_thr(NULL) load_upload_list(); load_servers_list(); cfg_reload_thr = new boost::thread(boost::bind(reload_config_thread_func, this, &lists_mutex)); - speed_test_thr = new boost::thread(boost::bind(speed_test_thread_func, &proxy_list, &static_proxy_list, vars.speed_test_file_url, &lists_mutex)); + speed_test_thr = new boost::thread(boost::bind(speed_test_thread_func, vars.proxy_check_interval, &proxy_list, &static_proxy_list, vars.speed_test_file_url, &lists_mutex)); } const int config::get_int(const std::string& data, const char* var, int default_) { @@ -473,7 +473,7 @@ void config::load_deleted_list(char* pth) } } -std::list<config::p_proxy_entry> *config::make_p_proxy_list() +/*std::list<config::p_proxy_entry> *config::make_p_proxy_list() { if(!p_proxy_list.empty()) p_proxy_list.clear(); @@ -511,7 +511,7 @@ std::list<config::p_proxy_entry> *config::make_p_proxy_list() } } return &p_proxy_list; -} +}*/ const int config::ban_time() { |