From 78010ef5fcdf1e8cb645beefbc6d3c4f6f0dccf1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 4 Mar 2019 20:27:53 +0800 Subject: [PATCH] 1 --- server/dbproxy/handlermgr.cc | 8 ++++++++ server/dbproxy/jsondatamgr.cc | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/server/dbproxy/handlermgr.cc b/server/dbproxy/handlermgr.cc index 9513cb5..26feee9 100644 --- a/server/dbproxy/handlermgr.cc +++ b/server/dbproxy/handlermgr.cc @@ -101,6 +101,10 @@ void HandlerMgr::_SS_GSM_ExecAsyncSql(f8::MsgHdr& hdr, const ss::SS_GSM_ExecAsyn if (msg.query_type() == 0) { a8::MutableXObject* conn_info = a8::MutableXObject::NewObject(); + { + std::shared_ptr conn_cfg = JsonDataMgr::Instance()->GetMysqlConf(); + conn_cfg->DeepCopy(*conn_info); + } conn_info->SetVal("database", a8::Format("gamedb%d_%d", {GAME_ID, App::Instance()->instance_id})); f8::DBPool::Instance()->ExecAsyncQuery(*conn_info, msg.sql().c_str(), @@ -115,6 +119,10 @@ void HandlerMgr::_SS_GSM_ExecAsyncSql(f8::MsgHdr& hdr, const ss::SS_GSM_ExecAsyn delete conn_info; } else if (msg.query_type() == 1) { a8::MutableXObject* conn_info = a8::MutableXObject::NewObject(); + { + std::shared_ptr conn_cfg = JsonDataMgr::Instance()->GetMysqlConf(); + conn_cfg->DeepCopy(*conn_info); + } conn_info->SetVal("database", a8::Format("gamedb%d_%d", {GAME_ID, App::Instance()->instance_id})); f8::DBPool::Instance()->ExecAsyncScript(*conn_info, msg.sql().c_str(), diff --git a/server/dbproxy/jsondatamgr.cc b/server/dbproxy/jsondatamgr.cc index 75300d4..a282ef3 100644 --- a/server/dbproxy/jsondatamgr.cc +++ b/server/dbproxy/jsondatamgr.cc @@ -12,7 +12,7 @@ void JsonDataMgr::Init() if (!f8::IsOnlineEnv()) { dbproxyserver_cluster_json_file = a8::Format("/var/data/conf_test/game%d/dbproxy/game%d.dbproxy.cluster.json", {GAME_ID, GAME_ID}); - mysql_cluster_json_file = a8::Format("/var/data/conf_test/game%d/dbproxy/game%d.dbproxy.cluster.json", + mysql_cluster_json_file = a8::Format("/var/data/conf_test/game%d/dbproxy/game%d.dbproxy.mysql.cluster.json", {GAME_ID, GAME_ID}); } else { dbproxyserver_cluster_json_file = a8::Format("../config/game%d.dbproxy.cluster.json", {GAME_ID});