diff --git a/server/bin/monitor.sh b/server/bin/monitor.sh index 8a98205..5aa992a 100644 --- a/server/bin/monitor.sh +++ b/server/bin/monitor.sh @@ -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' diff --git a/server/gameserver/jsondatamgr.cc b/server/gameserver/jsondatamgr.cc index 5d50982..2cc6dba 100644 --- a/server/gameserver/jsondatamgr.cc +++ b/server/gameserver/jsondatamgr.cc @@ -7,13 +7,22 @@ void JsonDataMgr::Init() { - if (!f8::IsOnlineEnv() && App::Instance()->HasFlag(2)) { - work_path_ = a8::Format("/root/pub/%d/%d/conf_test/game%d/gameserver", - { - GAME_ID, - App::Instance()->instance_id, - GAME_ID - }); + if (!f8::IsOnlineEnv()) { + 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 + }); + } 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; gameserver_cluster_json_file = a8::Format("%s/node%d/game%d.gameserver.cluster.json",