server_common/wsproxy
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
azw 2023-09-29 00:39:02 +00:00
parent cf9a023a31
commit 70f0469b30
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/wsproxy/jsondatamgr.cc
View File

@ -8,24 +8,17 @@
#include "jsondatamgr.h" #include "jsondatamgr.h"
#include "app.h" #include "app.h"
static const char* WORK_PATH = "../config";
void JsonDataMgr::Init() void JsonDataMgr::Init()
{ {
if (!f8::IsOnlineEnv()) {
work_path_ = a8::Format
("../../../conf_test/game%d/%s",
{
GAME_ID,
f8::IsTestEnv() ? "wsproxy.test" : "wsproxy.dev"
});
}
std::string wsproxy_cluster_json_file; std::string wsproxy_cluster_json_file;
std::string master_cluster_json_file; std::string master_cluster_json_file;
std::string kcp_conf_json_file; std::string kcp_conf_json_file;
wsproxy_cluster_json_file = a8::Format wsproxy_cluster_json_file = a8::Format
("%s/zone%d/node%d/game%d.wsproxy.cluster.json", ("%s/zone%d/node%d/game%d.wsproxy.cluster.json",
{ {
work_path_, WORK_PATH,
f8::App::Instance()->GetZoneId(), f8::App::Instance()->GetZoneId(),
f8::App::Instance()->GetNodeId(), f8::App::Instance()->GetNodeId(),
GAME_ID GAME_ID
@ -33,7 +26,7 @@ void JsonDataMgr::Init()
master_cluster_json_file = a8::Format master_cluster_json_file = a8::Format
("%s/zone%d/node%d/game%d.masterserver.cluster.json", ("%s/zone%d/node%d/game%d.masterserver.cluster.json",
{ {
work_path_, WORK_PATH,
f8::App::Instance()->GetZoneId(), f8::App::Instance()->GetZoneId(),
f8::App::Instance()->GetNodeId(), f8::App::Instance()->GetNodeId(),
GAME_ID GAME_ID
@ -41,7 +34,7 @@ void JsonDataMgr::Init()
kcp_conf_json_file = a8::Format kcp_conf_json_file = a8::Format
("%s/zone%d/kcp_conf.json", ("%s/zone%d/kcp_conf.json",
{ {
work_path_, WORK_PATH,
f8::App::Instance()->GetZoneId(), f8::App::Instance()->GetZoneId(),
}); });

1
server/wsproxy/jsondatamgr.h
View File

@ -36,7 +36,6 @@ class JsonDataMgr : public a8::Singleton<JsonDataMgr>
void SetKcpSwitch(int is_open); void SetKcpSwitch(int is_open);
private: private:
std::string work_path_ = "../config";
a8::XObject wsproxy_cluster_json_; a8::XObject wsproxy_cluster_json_;
a8::XObject master_cluster_json_; a8::XObject master_cluster_json_;
a8::XObject kcp_conf_json_; a8::XObject kcp_conf_json_;