diff --git a/server/gameserver/jsondatamgr.cc b/server/gameserver/jsondatamgr.cc index 70fecf9..dd77387 100644 --- a/server/gameserver/jsondatamgr.cc +++ b/server/gameserver/jsondatamgr.cc @@ -3,31 +3,17 @@ #include "jsondatamgr.h" #include "app.h" +#include "framework/cpp/utils.h" + void JsonDataMgr::Init() { std::string gameserver_cluster_json_file; - std::string dbserver_cluster_json_file; - std::string dpserver_cluster_json_file; - std::string bsserver_cluster_json_file; - std::string mysql_cluster_json_file; - if (getenv("machine_type")) { + if (!f8::IsOnlineEnv()) { gameserver_cluster_json_file = a8::Format("/var/data/conf_test/game%d/gameserver/game%d.gameserver.cluster.json", {GAME_ID, GAME_ID}); - dbserver_cluster_json_file = a8::Format("/var/data/conf_test/game%d/gameserver/game%d.dbserver.cluster.json", {GAME_ID, GAME_ID}); - dpserver_cluster_json_file = a8::Format("/var/data/conf_test/game%d/gameserver/game%d.dbproxy.cluster.json", {GAME_ID, GAME_ID}); - bsserver_cluster_json_file = a8::Format("/var/data/conf_test/game%d/gameserver/game%d.battleserver.cluster.json", {GAME_ID, GAME_ID}); - mysql_cluster_json_file = a8::Format("/var/data/conf_test/game%d/gameserver/game%d.gameserver.mysql.cluster.json", {GAME_ID, GAME_ID}); } else { gameserver_cluster_json_file = a8::Format("../config/game%d.gameserver.cluster.json", {GAME_ID}); - dbserver_cluster_json_file = a8::Format("../config/game%d.dbserver.cluster.json", {GAME_ID}); - dpserver_cluster_json_file = a8::Format("../config/game%d.dbproxy.cluster.json", {GAME_ID}); - bsserver_cluster_json_file = a8::Format("../config/game%d.battleserver.cluster.json", {GAME_ID}); - mysql_cluster_json_file = a8::Format("../config/game%d.gameserver.mysql.cluster.json", {GAME_ID}); } gameserver_cluster_json_.ReadFromFile(gameserver_cluster_json_file); - dbserver_cluster_json_.ReadFromFile(dbserver_cluster_json_file); - dpserver_cluster_json_.ReadFromFile(dpserver_cluster_json_file); - bsserver_cluster_json_.ReadFromFile(bsserver_cluster_json_file); - mysql_cluster_json_.ReadFromFile(mysql_cluster_json_file); } void JsonDataMgr::UnInit() @@ -41,35 +27,3 @@ std::shared_ptr JsonDataMgr::GetConf() } return gameserver_cluster_json_[App::Instance()->instance_id - 1]; } - -std::shared_ptr JsonDataMgr::GetDBSConf() -{ - if (App::Instance()->instance_id < 1 || App::Instance()->instance_id > dbserver_cluster_json_.Size()) { - abort(); - } - return dbserver_cluster_json_[App::Instance()->instance_id - 1]; -} - -std::shared_ptr JsonDataMgr::GetDPSConf() -{ - if (App::Instance()->instance_id < 1 || App::Instance()->instance_id > dpserver_cluster_json_.Size()) { - abort(); - } - return dpserver_cluster_json_[App::Instance()->instance_id - 1]; -} - -std::shared_ptr JsonDataMgr::GetBSConf() -{ - if (App::Instance()->instance_id < 1 || App::Instance()->instance_id > bsserver_cluster_json_.Size()) { - abort(); - } - return bsserver_cluster_json_[App::Instance()->instance_id - 1]; -} - -std::shared_ptr JsonDataMgr::GetMysqlConf() -{ - if (App::Instance()->instance_id < 1 || App::Instance()->instance_id > mysql_cluster_json_.Size()) { - abort(); - } - return mysql_cluster_json_[App::Instance()->instance_id - 1]; -} diff --git a/server/gameserver/jsondatamgr.h b/server/gameserver/jsondatamgr.h index 0e525a5..71f432d 100644 --- a/server/gameserver/jsondatamgr.h +++ b/server/gameserver/jsondatamgr.h @@ -11,15 +11,7 @@ class JsonDataMgr : public a8::Singleton void UnInit(); std::shared_ptr GetConf(); - std::shared_ptr GetDBSConf(); - std::shared_ptr GetDPSConf(); - std::shared_ptr GetBSConf(); - std::shared_ptr GetMysqlConf(); private: a8::XObject gameserver_cluster_json_; - a8::XObject dbserver_cluster_json_; - a8::XObject dpserver_cluster_json_; - a8::XObject bsserver_cluster_json_; - a8::XObject mysql_cluster_json_; };