diff --git a/server/wsproxy/jsondatamgr.cc b/server/wsproxy/jsondatamgr.cc index 08fa337..c2fab68 100644 --- a/server/wsproxy/jsondatamgr.cc +++ b/server/wsproxy/jsondatamgr.cc @@ -11,37 +11,42 @@ void JsonDataMgr::Init() { if (!f8::IsOnlineEnv()) { if (f8::IsTestEnv()) { - work_path_ = a8::Format("../../../conf_test/game%d/wsproxy.test", - { - GAME_ID, - }); + work_path_ = a8::Format + ("../../../conf_test/game%d/wsproxy.test", + { + GAME_ID, + }); } else { - work_path_ = a8::Format("../../../conf_test/game%d/wsproxy.dev", - { - GAME_ID - }); + work_path_ = a8::Format + ("../../../conf_test/game%d/wsproxy.dev", + { + GAME_ID + }); } } std::string wsproxyserver_cluster_json_file; std::string masterserver_cluster_json_file; std::string routing_tables_json_file; - wsproxyserver_cluster_json_file = a8::Format("%s/node%d/game%d.wsproxy.cluster.json", - { - work_path_, - App::Instance()->GetNodeId(), - GAME_ID - }); - masterserver_cluster_json_file = a8::Format("%s/node%d/game%d.masterserver.cluster.json", - { - work_path_, - App::Instance()->GetNodeId(), - GAME_ID - }); - routing_tables_json_file = a8::Format("%s/routing_tables.json", - { - work_path_ - }); + wsproxyserver_cluster_json_file = a8::Format + ("%s/node%d/game%d.wsproxy.cluster.json", + { + work_path_, + App::Instance()->GetNodeId(), + GAME_ID + }); + masterserver_cluster_json_file = a8::Format + ("%s/node%d/game%d.masterserver.cluster.json", + { + work_path_, + App::Instance()->GetNodeId(), + GAME_ID + }); + routing_tables_json_file = a8::Format + ("%s/routing_tables.json", + { + work_path_ + }); wsproxyserver_cluster_json_.ReadFromFile(wsproxyserver_cluster_json_file); masterserver_cluster_json_.ReadFromFile(masterserver_cluster_json_file);