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

1

Browse Source
This commit is contained in:
aozhiwei 2019-05-31 09:53:20 +08:00
parent 552f6a7de7
commit 3120257ff9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/tools/scripts/ci/wsproxy2001/boundle.sh
View File

@ -1,6 +1,6 @@
cd third_party/wsproxy/server/wsproxy cd third_party/wsproxy/server/wsproxy
python ../tools/scripts/construct/build_pb.py --nohooks 1 python ../tools/scripts/construct/build_pb.py --nohooks 1
cmake $1 . cmake -DGAME_ID=2001 -DMASTER_MODE=1 .
make clean make clean
make make
cp ../bin/wsproxy ../../../../bin/ cp ../bin/wsproxy ../../../../bin/

6
server/wsproxy/jsondatamgr.cc
View File

@ -66,9 +66,9 @@ void JsonDataMgr::Init()
masterserver_cluster_json_.ReadFromFile(masterserver_cluster_json_file); masterserver_cluster_json_.ReadFromFile(masterserver_cluster_json_file);
routing_tables_json_.ReadFromFile(routing_tables_json_file); routing_tables_json_.ReadFromFile(routing_tables_json_file);
node_host_mutex_->lock(); node_host_mutex_->lock();
for (int i = 0; i < routing_tables_conf->Size(); ++i) { for (int i = 0; i < routing_tables_json_.Size(); ++i) {
int node_id = master_svr_conf->At("node_id")->AsXValue(); int node_id = routing_tables_json_.At("node_id")->AsXValue();
std::string host = master_svr_conf->At("host")->AsXValue(); std::string host = routing_tables_json_.At("host")->AsXValue();
if (node_host_hash_.find(node_id) != node_host_hash_.end()) { if (node_host_hash_.find(node_id) != node_host_hash_.end()) {
abort(); abort();
} }