summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Borisov <b0ric.alex@gmail.com>2012-03-24 11:42:18 +0200
committerAlex Borisov <b0ric.alex@gmail.com>2012-03-24 11:42:18 +0200
commit45a1eb48d982ebff2edfc66e254ce220b1cf93a5 (patch)
tree62bde327f89fe6b47db5b9b54011df8b24db9a97
parentefdd71f35935f8b14abfb26fa852bad77dbd3f9e (diff)
parenta1bb0a81f13df7868fcec2c00ff58a123fcd37b4 (diff)
Merge branch 'master' of ssh://sss.chaoslab.ru/home/private_git/proxy_ui
-rwxr-xr-xserver/server/config.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp
index 6d945d3..4f32c0a 100755
--- a/server/server/config.cpp
+++ b/server/server/config.cpp
@@ -30,7 +30,7 @@ void speed_test_thread_func(config *cfg, int check_interval, std::list<config::p
for(std::list<config::static_proxy_entry>::iterator i = static_proxy_list->begin(), end = static_proxy_list->end(); i != end; ++i)
{
speedtest t(test_url);
- int sp = (int)t.test(&(*i));
+ size_t sp = t.test(&(*i));
if(cfg->log_speed())
{
char port[10];
@@ -38,7 +38,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<<":"<<port<<"\tspeed: "<<sp<<"b/s\n";
+ *logger << time_str() << ": "<<i->host<<":"<<port<<"\t"<<sp<<"\n";
logger->unlock();
}
boost::this_thread::sleep(boost::posix_time::seconds(1));