diff --git a/server/dbproxy/app.cc b/server/dbproxy/app.cc index 7c41112..e6276e2 100644 --- a/server/dbproxy/app.cc +++ b/server/dbproxy/app.cc @@ -40,8 +40,8 @@ struct IMMsgNode }; -const char* const PROJ_LOG_ROOT = "/data/logs/%s/logs"; -const char* const PROJ_LOG_FILENAME = "log_$pid_%Y%m%d.log"; +const char* const PROJ_LOG_ROOT_FMT = "/data/logs/%s/logs"; +const char* const PROJ_LOG_FILENAME_FMT = "log_$pid_%Y%m%d.log"; static void SavePerfLog() { @@ -351,16 +351,18 @@ void App::ProcessIMMsg() void App::InitLog() { - std::string filename_fmt = PROJ_LOG_FILENAME; + std::string filename_fmt = PROJ_LOG_FILENAME_FMT; if (getenv("is_dev_env")) { a8::ReplaceString(filename_fmt, "$pid", a8::XValue(0)); } else { a8::ReplaceString(filename_fmt, "$pid", a8::XValue(getpid())); } - a8::MkDir(a8::Format(PROJ_ROOT, {PROJ_NAME})); - a8::MkDir(a8::Format(PROJ_LOG_ROOT, {PROJ_NAME})); - a8::UdpLog::Instance()->SetLogFileName(a8::Format(PROJ_LOG_ROOT, {PROJ_NAME}) + "/" + filename_fmt); + a8::MkDir(a8::Format(PROJ_ROOT_FMT, {a8::Format(PROJ_NAME_FMT, {GAME_ID})})); + a8::MkDir(a8::Format(PROJ_LOG_ROOT_FMT, {a8::Format(PROJ_NAME_FMT, {GAME_ID})})); + a8::UdpLog::Instance()->SetLogFileName(a8::Format(PROJ_LOG_ROOT_FMT, + {a8::Format(PROJ_NAME_FMT, {GAME_ID})}) + "/" + filename_fmt + ); a8::UdpLog::Instance()->Init(); } diff --git a/server/dbproxy/constant.h b/server/dbproxy/constant.h index d73f953..ff6ee47 100644 --- a/server/dbproxy/constant.h +++ b/server/dbproxy/constant.h @@ -18,6 +18,6 @@ enum NetHandler_e HID_DBPool, }; -const char* const PROJ_NAME = "game" A8_MACRO_STR(GAME_ID) "_dbproxy"; -const char* const PROJ_ROOT = "/data/logs/%s"; +const char* const PROJ_NAME_FMT = "game%d_dbproxy"; +const char* const PROJ_ROOT_FMT = "/data/logs/%s"; diff --git a/third_party/a8engine b/third_party/a8engine index ab6f413..8ba8ad7 160000 --- a/third_party/a8engine +++ b/third_party/a8engine @@ -1 +1 @@ -Subproject commit ab6f41321c5925b5a26f4a106f784551a172ecc9 +Subproject commit 8ba8ad7c7b28920af6c978482e5a13b4327a9f80