diff --git a/server/rankserver/IMListener.cc b/server/rankserver/IMListener.cc index bf6026f..ff65f50 100644 --- a/server/rankserver/IMListener.cc +++ b/server/rankserver/IMListener.cc @@ -86,7 +86,7 @@ void IMListener::Init() tcp_listener_->on_error = GSListeneron_error; tcp_listener_->bind_address = "0.0.0.0"; - tcp_listener_->bind_port = JsonDataMgr::Instance()->GetConf()->At("imserver_listen_port")->AsXValue(); + tcp_listener_->bind_port = JsonDataMgr::Instance()->GetConf()->At("listen_port")->AsXValue(); tcp_listener_->Open(); } diff --git a/server/rankserver/jsondatamgr.cc b/server/rankserver/jsondatamgr.cc index bcbfe25..6c81b6a 100644 --- a/server/rankserver/jsondatamgr.cc +++ b/server/rankserver/jsondatamgr.cc @@ -7,17 +7,17 @@ void JsonDataMgr::Init() { - std::string masterserver_cluster_json_file; + std::string rankserver_cluster_json_file; if (!f8::IsOnlineEnv()) { if (f8::IsTestEnv()) { - work_path_ = a8::Format("/root/pub/%d/%d/conf_test/game%d/masterserver.test", + work_path_ = a8::Format("/root/pub/%d/%d/conf_test/game%d/rankserver.test", { GAME_ID, App::Instance()->instance_id, GAME_ID }); } else { - work_path_ = a8::Format("/root/pub/%d/%d/conf_test/game%d/masterserver.dev", + work_path_ = a8::Format("/root/pub/%d/%d/conf_test/game%d/rankserver.dev", { GAME_ID, App::Instance()->instance_id, @@ -25,11 +25,11 @@ void JsonDataMgr::Init() }); } } - masterserver_cluster_json_file = a8::Format("%s/node1/game9003.masterserver.cluster.json", + rankserver_cluster_json_file = a8::Format("%s/node1/game9003.rankserver.cluster.json", { work_path_, }); - masterserver_cluster_json_.ReadFromFile(masterserver_cluster_json_file); + rankserver_cluster_json_.ReadFromFile(rankserver_cluster_json_file); } void JsonDataMgr::UnInit() @@ -38,13 +38,9 @@ void JsonDataMgr::UnInit() std::shared_ptr JsonDataMgr::GetConf() { - if (App::Instance()->instance_id < 1 || App::Instance()->instance_id > masterserver_cluster_json_.Size()) { + if (App::Instance()->instance_id < 1 || App::Instance()->instance_id > rankserver_cluster_json_.Size()) { abort(); } - return masterserver_cluster_json_[App::Instance()->instance_id - 1]; + return rankserver_cluster_json_[App::Instance()->instance_id - 1]; } -int JsonDataMgr::GetMasterSvrNum() -{ - return masterserver_cluster_json_.Size(); -} diff --git a/server/rankserver/jsondatamgr.h b/server/rankserver/jsondatamgr.h index a7ae5e7..e9c0b88 100644 --- a/server/rankserver/jsondatamgr.h +++ b/server/rankserver/jsondatamgr.h @@ -11,12 +11,8 @@ class JsonDataMgr : public a8::Singleton void UnInit(); std::shared_ptr GetConf(); - int GetMasterSvrNum(); - - std::string ip; - int listen_port = 0; private: std::string work_path_ = "../config"; - a8::XObject masterserver_cluster_json_; + a8::XObject rankserver_cluster_json_; };