Merge branch 'master' of http://local.beijingyongan.com:3000/linux-dev/ya-serv

card_base.cpp

@@ -152,7 +152,8 @@ void card_location_base::on_message(zloop<task*> * loop,const message_locinfo&lo
 	{
 		if(site_ptr->is_path_empty())
 		{
-			log_warn("接收到分站的数据，site=%d,ct=%d,但是分站路径为空",site_ptr->id(),loc.m_card_ct);
+			log_warn("接收到分站的数据，site=%d,card=%d,ct=%d,但是分站路径为空",site_ptr->id(),m_id,loc.m_card_ct);
+			return;
 		}
 		m_message_handle->on_message(loop,loc,is_history);
 	}