server/game2002
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2019-12-16 20:20:42 +08:00
parent a27bd57c6e
commit e7219df9a5
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/bin/monitor.sh
View File

@ -1 +1,11 @@
python ../../third_party/tools/scripts/server/monitor.py gameserver2001 '-n1 -i1' path_arr=$(echo $PWD|tr '/' '\n')
path_arr=(${path_arr})
GAME_ID=${path_arr[-5]}
if echo $GAME_ID | grep -q '[^0-9]'
then
echo 'game_id参数必须为数字'
exit 1
fi
python ../../third_party/tools/scripts/server/monitor.py gameserver${GAME_ID} '-n1 -i1'

23
server/gameserver/jsondatamgr.cc
View File

@ -7,13 +7,22 @@
void JsonDataMgr::Init() void JsonDataMgr::Init()
{ {
if (!f8::IsOnlineEnv() && App::Instance()->HasFlag(2)) { if (!f8::IsOnlineEnv()) {
work_path_ = a8::Format("/root/pub/%d/%d/conf_test/game%d/gameserver", if (f8::IsTestEnv()) {
{ work_path_ = a8::Format("/root/pub/%d/%d/conf_test/game%d/gameserver.test",
GAME_ID, {
App::Instance()->instance_id, GAME_ID,
GAME_ID App::Instance()->instance_id,
}); GAME_ID
});
} else {
work_path_ = a8::Format("/root/pub/%d/%d/conf_test/game%d/gameserver.dev",
{
GAME_ID,
App::Instance()->instance_id,
GAME_ID
});
}
} }
std::string gameserver_cluster_json_file; std::string gameserver_cluster_json_file;
gameserver_cluster_json_file = a8::Format("%s/node%d/game%d.gameserver.cluster.json", gameserver_cluster_json_file = a8::Format("%s/node%d/game%d.gameserver.cluster.json",