Merge pull request #7 from sogou/master

merge from sogou/srpc master
sogou · Mar 27, 2021 · a2aca9b · a2aca9b
2 parents 099349c + 75bfb7c
commit a2aca9b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/generator/generator.cc b/src/generator/generator.cc
@@ -319,8 +319,10 @@ void Generator::generate_srpc_file(const idl_info& cur_info)
 		{
 			this->printer.print_client_constructor(type, desc.block_name,
 												   cur_info.package_name);
-			this->printer.print_client_methods(type, desc.block_name, desc.rpcs);
-			this->printer.print_client_create_task(type, desc.block_name, desc.rpcs);
+			this->printer.print_client_methods(type, desc.block_name, desc.rpcs,
+											   cur_info.package_name);
+			this->printer.print_client_create_task(type, desc.block_name,
+												   desc.rpcs, cur_info.package_name);
 		}
 
 		this->printer.print_service_namespace_end(desc.block_name);

diff --git a/workflow b/workflow
+1 −1		CMakeLists.txt
+2 −0		docs/about-config.md
+1 −1		docs/about-service-management.md
+2 −0		docs/en/about-config.md
+1 −1		docs/en/about-service-management.md
+4 −3		src/factory/WFTaskFactory.inl
+16 −16		src/kernel/Communicator.cc
+4 −0		src/kernel/Communicator.h
+6 −4		src/manager/EndpointParams.h
+43 −5		src/manager/RouteManager.cc
+1 −0		src/manager/RouteManager.h
+13 −1		src/manager/UpstreamManager.cc
+2 −2		src/manager/UpstreamManager.h
+76 −30		src/nameservice/UpstreamPolicies.cc
+13 −6		src/nameservice/UpstreamPolicies.h
+2 −2		src/nameservice/WFDNSResolver.cc
+27 −5		src/nameservice/WFServiceGovernance.cc
+5 −2		src/nameservice/WFServiceGovernance.h
+1 −0		src/protocol/MySQLResult.cc
+56 −24		test/upstream_unittest.cc