server/relation
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2020-06-17 14:08:14 +08:00
parent 1adf9d3647
commit 7b7b1d9674
5 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/imserver/dbengine.cc
View File

@ -3,6 +3,7 @@
#include <a8/openssl.h> #include <a8/openssl.h>
#include "dbengine.h" #include "dbengine.h"
#include "jsondatamgr.h"
void DBEngine::Init() void DBEngine::Init()
{ {
@ -60,7 +61,11 @@ a8::XObject DBEngine::GetConnInfo(const std::string& data)
a8::XObject DBEngine::GetConnInfo(long long data) a8::XObject DBEngine::GetConnInfo(long long data)
{ {
a8::XObject conn_info; std::shared_ptr<a8::XObject> mysql_cluster_conf = JsonDataMgr::Instance()->GetMysqlClusterConf();
if (mysql_cluster_conf->Size() <= 0) {
abort();
}
a8::XObject conn_info = *(mysql_cluster_conf->At(data % mysql_cluster_conf->Size()));
return conn_info; return conn_info;
} }

6
server/imserver/jsondatamgr.cc
View File

@ -40,6 +40,7 @@ void JsonDataMgr::Init()
{ {
work_path_, work_path_,
}); });
mysql_cluster_json_.ReadFromFile(mysql_cluster_json_file);
imserver_cluster_json_.ReadFromFile(imserver_cluster_json_file); imserver_cluster_json_.ReadFromFile(imserver_cluster_json_file);
masterserver_cluster_json_.ReadFromFile(masterserver_cluster_json_file); masterserver_cluster_json_.ReadFromFile(masterserver_cluster_json_file);
} }
@ -61,3 +62,8 @@ std::shared_ptr<a8::XObject> JsonDataMgr::GetMasterServerClusterConf()
{ {
return std::make_shared<a8::XObject>(masterserver_cluster_json_); return std::make_shared<a8::XObject>(masterserver_cluster_json_);
} }
std::shared_ptr<a8::XObject> JsonDataMgr::GetMysqlClusterConf()
{
return std::make_shared<a8::XObject>(mysql_cluster_json_);
}

1
server/imserver/jsondatamgr.h
View File

@ -12,6 +12,7 @@ class JsonDataMgr : public a8::Singleton<JsonDataMgr>
std::shared_ptr<a8::XObject> GetConf(); std::shared_ptr<a8::XObject> GetConf();
std::shared_ptr<a8::XObject> GetMasterServerClusterConf(); std::shared_ptr<a8::XObject> GetMasterServerClusterConf();
std::shared_ptr<a8::XObject> GetMysqlClusterConf();
private: private:
std::string work_path_ = "../config"; std::string work_path_ = "../config";

6
server/imserver/playermgr.cc
View File

@ -366,6 +366,12 @@ void PlayerMgr::AsyncLoginOnOk(const std::string& account_id,
} }
pending_socket_hash_.erase(hdr->socket_handle); pending_socket_hash_.erase(hdr->socket_handle);
pending_account_hash_.erase(account_id); pending_account_hash_.erase(account_id);
{
cs::SMLogin respmsg;
respmsg.set_errcode(0);
respmsg.set_errmsg("ok");
hum->SendMsg(respmsg);
}
f8::MsgHdr::Destroy(hdr); f8::MsgHdr::Destroy(hdr);
} }
} }

2
server/masterserver/svrmgr.cc
View File

@ -17,7 +17,9 @@ void SvrMgr::Init()
a8::XParams(), a8::XParams(),
[] (const a8::XParams& param) [] (const a8::XParams& param)
{ {
#ifndef DEBUG
SvrMgr::Instance()->ClearTimeOutNode(); SvrMgr::Instance()->ClearTimeOutNode();
#endif
}); });
} }