From 18eb82bc81ce536113215bc5c38d206af1f9a4a9 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 26 Apr 2019 19:04:34 +0800 Subject: [PATCH] flags2 --- server/gameserver/jsondatamgr.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/server/gameserver/jsondatamgr.cc b/server/gameserver/jsondatamgr.cc index dd77387..4508197 100644 --- a/server/gameserver/jsondatamgr.cc +++ b/server/gameserver/jsondatamgr.cc @@ -9,7 +9,15 @@ void JsonDataMgr::Init() { std::string gameserver_cluster_json_file; 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}); + if (App::Instance()->flags.find(2) != App::Instance()->flags.end()) { + gameserver_cluster_json_file = a8::Format("/root/pub/conf_test/game%d/gameserver/" + "game%d.gameserver.cluster.json", + {GAME_ID, GAME_ID}); + } else { + gameserver_cluster_json_file = a8::Format("/var/data/conf_test/game%d/gameserver/" + "game%d.gameserver.cluster.json", + {GAME_ID, GAME_ID}); + } } else { gameserver_cluster_json_file = a8::Format("../config/game%d.gameserver.cluster.json", {GAME_ID}); }