summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xserver/server/config.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp
index 4400f3d..ddc6983 100755
--- a/server/server/config.cpp
+++ b/server/server/config.cpp
@@ -33,13 +33,13 @@ void speed_test_thread_func(std::list<config::proxy_entry>* proxy_list, std::lis
t.test(&(*i));
boost::this_thread::sleep(boost::posix_time::seconds(2));
}
- for(std::list<config::proxy_entry>::iterator i = proxy_list->begin(), end = proxy_list->end(); i != end; ++i)
+/* 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));
- }
+ } */
// delete l;
m->unlock();
boost::this_thread::sleep(boost::posix_time::minutes(180));
@@ -90,7 +90,7 @@ void config::load_cvars()
}
}
-config::config(const char *pth)
+config::config(const char *pth): cfg_reload_thr(NULL), speed_test_thr(NULL)
{
if(pth)
config_path = pth;
@@ -634,5 +634,8 @@ const int config::proxy_check_interval()
config::~config()
{
- cfg_reload_thr->interrupt();
+ if(cfg_reload_thr)
+ cfg_reload_thr->interrupt();
+ if(speed_test_thr)
+ speed_test_thr->interrupt();
}