diff --git a/server/tools/scripts/ci/wsproxy2001/boundle.sh b/server/tools/scripts/ci/wsproxy2001/boundle.sh index e06e3e5..8df4b99 100644 --- a/server/tools/scripts/ci/wsproxy2001/boundle.sh +++ b/server/tools/scripts/ci/wsproxy2001/boundle.sh @@ -1,6 +1,6 @@ cd third_party/wsproxy/server/wsproxy python ../tools/scripts/construct/build_pb.py --nohooks 1 -cmake $1 . +cmake -DGAME_ID=2001 -DMASTER_MODE=1 . make clean make cp ../bin/wsproxy ../../../../bin/ diff --git a/server/wsproxy/jsondatamgr.cc b/server/wsproxy/jsondatamgr.cc index 64628b1..7b124f6 100644 --- a/server/wsproxy/jsondatamgr.cc +++ b/server/wsproxy/jsondatamgr.cc @@ -66,9 +66,9 @@ void JsonDataMgr::Init() masterserver_cluster_json_.ReadFromFile(masterserver_cluster_json_file); routing_tables_json_.ReadFromFile(routing_tables_json_file); node_host_mutex_->lock(); - for (int i = 0; i < routing_tables_conf->Size(); ++i) { - int node_id = master_svr_conf->At("node_id")->AsXValue(); - std::string host = master_svr_conf->At("host")->AsXValue(); + for (int i = 0; i < routing_tables_json_.Size(); ++i) { + int node_id = routing_tables_json_.At("node_id")->AsXValue(); + std::string host = routing_tables_json_.At("host")->AsXValue(); if (node_host_hash_.find(node_id) != node_host_hash_.end()) { abort(); }