From bfb2767243aa4e78cc6713ef35c04a47b586b586 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Sat, 31 Aug 2019 19:21:38 +0800
Subject: [PATCH] masterserver add alive_count

---
 server/masterserver/gsmgr.cc | 5 +++++
 server/masterserver/gsmgr.h  | 1 +
 2 files changed, 6 insertions(+)

diff --git a/server/masterserver/gsmgr.cc b/server/masterserver/gsmgr.cc
index 6de04bf..e649241 100644
--- a/server/masterserver/gsmgr.cc
+++ b/server/masterserver/gsmgr.cc
@@ -48,6 +48,7 @@ void GSMgr::___GSReport(f8::JsonHttpRequest* request)
 {
     std::string ip = request->request.Get("ip");
     int port = request->request.Get("port");
+    int alive_count = request->request.Get("alive_count");
     int online_num = request->request.Get("online_num");
     int room_num = request->request.Get("room_num");
     int instance_id = request->request.Get("instance_id");
@@ -59,6 +60,7 @@ void GSMgr::___GSReport(f8::JsonHttpRequest* request)
     if (itr != node_key_hash_.end()) {
         if (itr->second.online_num != online_num ||
             itr->second.room_num != room_num ||
+            itr->second.alive_count != alive_count ||
             itr->second.servicing != servicing
             ) {
             itr->second.online_num = online_num;
@@ -66,6 +68,7 @@ void GSMgr::___GSReport(f8::JsonHttpRequest* request)
             itr->second.servicing = servicing;
             RearrangeNode();
         }
+        itr->second.alive_count = alive_count;
         itr->second.last_active_tick = a8::XGetTickCount();
     } else {
         GSNode gs;
@@ -73,6 +76,7 @@ void GSMgr::___GSReport(f8::JsonHttpRequest* request)
         gs.node_id = node_id;
         gs.node_idx = App::Instance()->NewUuid();
         gs.instance_id = instance_id;
+        gs.alive_count = alive_count;
         gs.online_num = online_num;
         gs.room_num = room_num;
         gs.ip = ip;
@@ -98,6 +102,7 @@ void GSMgr::___GSList(f8::JsonHttpRequest* request)
             node->SetVal("node_id", pair.second.node_id);
             node->SetVal("instance_id", pair.second.instance_id);
             node->SetVal("room_num", pair.second.room_num);
+            node->SetVal("alive_count", pair.second.alive_count);
             node->SetVal("online_num", pair.second.online_num);
             node->SetVal("ip", pair.second.ip);
             node->SetVal("port", pair.second.port);
diff --git a/server/masterserver/gsmgr.h b/server/masterserver/gsmgr.h
index 6b988f1..1e19662 100644
--- a/server/masterserver/gsmgr.h
+++ b/server/masterserver/gsmgr.h
@@ -9,6 +9,7 @@ struct GSNode
     int node_id = 0;
     int instance_id = 0;
     int room_num = 0;
+    int alive_count = 0;
     int online_num = 0;
     std::string ip;
     int port = 0;