From c120fccab2cb877aa7c522d5c47f5ac9fd5592aa Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 25 Aug 2020 19:55:06 +0800 Subject: [PATCH] 1 --- server/masterserver/app.cc | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/server/masterserver/app.cc b/server/masterserver/app.cc index a87e85a..82d8634 100755 --- a/server/masterserver/app.cc +++ b/server/masterserver/app.cc @@ -23,6 +23,7 @@ #include "framework/cpp/msgqueue.h" #include "framework/cpp/tglog.h" +#include "framework/cpp/utils.h" struct MsgNode { @@ -483,7 +484,25 @@ bool App::IsSeparateChannel(int channel) void App::LoadSeparateChannelConfig() { std::string data; - a8::ReadStringFromFile("../config/separate_channels.csv", data); + std::string filename = "../config/separate_channels.csv"; + if (!f8::IsOnlineEnv()) { + if (f8::IsTestEnv()) { + filename = a8::Format("/root/pub/%d/%d/conf_test/game%d/masterserver.test/separate_channels.csv", + { + GAME_ID, + App::Instance()->instance_id, + GAME_ID + }); + } else { + filename = a8::Format("/root/pub/%d/%d/conf_test/game%d/masterserver.dev/separate_channels.csv", + { + GAME_ID, + App::Instance()->instance_id, + GAME_ID + }); + } + } + a8::ReadStringFromFile(filename, data); std::vector strings; a8::Split(data, strings, ','); separate_channel_hash_.clear(); @@ -493,9 +512,10 @@ void App::LoadSeparateChannelConfig() separate_channel_hash_.insert(channel); } } - a8::UdpLog::Instance()->Info("LoadSeparateChannelConfig channelids:%s", + a8::UdpLog::Instance()->Debug("LoadSeparateChannelConfig %s channelids:%s", { - GetSeparateChannelConfigData() + filename, + GetSeparateChannelConfigData() }); }