@@ -199,9 +199,9 @@ void center::wait_cli_login()
199
199
if (cached == false )
200
200
{
201
201
if (this ->mirs_data_ .size () == 0 )
202
- memset (&available_mir, 0 sizeof (IP));
202
+ memset (&available_mir, 0 , sizeof (IP));
203
203
else if (this ->mirs_data_ .size () == 1 )
204
- available_mir = * mirs_data_.begin ();
204
+ available_mir = mirs_data_.begin ()-> first ;
205
205
// 回复可用mir地址
206
206
int send_num = sendto (sock_fd, &available_mir, sizeof (available_mir), 0 , (sockaddr*)&addr_cli, sizeof (addr_cli));
207
207
login_count++;
@@ -312,28 +312,29 @@ void center::listen_mir_beat()
312
312
if (mirs_data_.count (mir_ip) == 0 )
313
313
{
314
314
mirs_data_.insert ({mir_ip, MirDescript ()});
315
+ LOG_INFO << " mirror : " << mir_ip.to_string () << " login" ;
315
316
// dblog(MIR_LIGIN);
316
317
}
317
318
else
318
319
{
319
320
mirs_data_[mir_ip].reset_beat (telemeter::setting->mir_max_disbeat_time_ );
320
321
// 记录负载情况到缓存
321
322
// mirs_data_[mir_ip].recordLoad();
322
- all_beat_count++;
323
- if (all_beat_count >= mirs_data_.size () - 1 )
324
- {
325
- for (auto & kvp : mirs_data_)
326
- {
327
- if (kvp.second .decre_and_get_beat () <= 0 );
328
- {
329
- // 说明有mir掉线了
330
- int i = 3 ; // 占位避免编译器报warning
331
- // dblog(MIR_DISCONECT);
332
- mirs_data_.erase (kvp.first );
333
- LOG_INFO << " mirror disconnect: " << const_cast <IP*>(&kvp.first )->to_string ();
334
- }
335
- }
336
- }
323
+ // all_beat_count++;
324
+ // if(all_beat_count >= mirs_data_.size() - 1)
325
+ // {
326
+ // for(auto& kvp : mirs_data_)
327
+ // {
328
+ // if(kvp.second.decre_and_get_beat() <= 0);
329
+ // {
330
+ // //说明有mir掉线了
331
+ // int i = 3; //占位避免编译器报warning
332
+ // //dblog(MIR_DISCONECT);
333
+ // mirs_data_.erase(kvp.first);
334
+ // LOG_INFO << "mirror disconnect: " << const_cast<IP*>(&kvp.first)->to_string();
335
+ // }
336
+ // }
337
+ // }
337
338
}
338
339
339
340
}
0 commit comments