server_common/dbproxy
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2019-03-04 20:27:53 +08:00
parent 9d39452286
commit 78010ef5fc
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/dbproxy/handlermgr.cc
View File

@ -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<a8::XObject> 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<a8::XObject> 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(),

2
server/dbproxy/jsondatamgr.cc
View File

@ -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});