This commit is contained in:
aozhiwei 2019-03-20 11:36:40 +08:00
parent 7dd296d55d
commit 274cb8f14e
2 changed files with 3 additions and 57 deletions

View File

@ -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<a8::XObject> JsonDataMgr::GetConf()
}
return gameserver_cluster_json_[App::Instance()->instance_id - 1];
}
std::shared_ptr<a8::XObject> 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<a8::XObject> 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<a8::XObject> 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<a8::XObject> 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];
}

View File

@ -11,15 +11,7 @@ class JsonDataMgr : public a8::Singleton<JsonDataMgr>
void UnInit();
std::shared_ptr<a8::XObject> GetConf();
std::shared_ptr<a8::XObject> GetDBSConf();
std::shared_ptr<a8::XObject> GetDPSConf();
std::shared_ptr<a8::XObject> GetBSConf();
std::shared_ptr<a8::XObject> 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_;
};