Client和Server添加ChannelOption参数

yileicn · Aug 19, 2019 · 0be560b · 0be560b
1 parent 0df9c08
commit 0be560b
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 16 deletions.
diff --git a/src/Grpc.Extension/Internal/AutoChannelCallInvoker.cs b/src/Grpc.Extension/Internal/AutoChannelCallInvoker.cs
@@ -12,12 +12,12 @@ namespace Grpc.Extension.Internal
     /// </summary>
     internal class AutoChannelCallInvoker : CallInvoker
     {
-        private ChannelManager _channelManager;
+        private ChannelPool _channelManager;
 
         /// <summary>
         /// 自动负载Channel的CallInvoker
         /// </summary>
-        public AutoChannelCallInvoker(ChannelManager channelManager)
+        public AutoChannelCallInvoker(ChannelPool channelManager)
         {
             this._channelManager = channelManager;
         }

diff --git a/...Grpc.Extension/Internal/ChannelManager.cs → src/Grpc.Extension/Internal/ChannelPool.cs b/...Grpc.Extension/Internal/ChannelManager.cs → src/Grpc.Extension/Internal/ChannelPool.cs
@@ -13,7 +13,7 @@ namespace Grpc.Extension.Internal
     /// <summary>
     /// Channel统一管理
     /// </summary>
-    internal class ChannelManager
+    internal class ChannelPool
     {
         private ConcurrentDictionary<string, ChannelInfo> _channels = new ConcurrentDictionary<string, ChannelInfo>();
         private IServiceDiscovery _serviceDiscovery;
@@ -25,7 +25,7 @@ internal class ChannelManager
         /// </summary>
         /// <param name="serviceDiscovery"></param>
         /// <param name="loadBalancer"></param>
-        public ChannelManager(IServiceDiscovery serviceDiscovery, ILoadBalancer loadBalancer,IMemoryCache memoryCache)
+        public ChannelPool(IServiceDiscovery serviceDiscovery, ILoadBalancer loadBalancer,IMemoryCache memoryCache)
         {
             this._serviceDiscovery = serviceDiscovery;
             this._loadBalancer = loadBalancer;
@@ -99,7 +99,7 @@ private Channel GetChannelCore(string endpoint,ChannelConfig config)
 
         private ChannelInfo CreateChannel(string endPoint, ChannelConfig config)
         {
-            var channel = new Channel(endPoint, ChannelCredentials.Insecure);
+            var channel = new Channel(endPoint, ChannelCredentials.Insecure, config.ChannelOptions);
 
             var tryCount = 0;//重试计数
             //检查channel状态

diff --git a/src/Grpc.Extension/Internal/GrpcClientManager.cs b/src/Grpc.Extension/Internal/GrpcClientManager.cs
@@ -35,7 +35,7 @@ public GrpcClientManager(IServiceProvider serviceProvider, IEnumerable<ClientInt
         /// <returns></returns>
         public T GetGrpcClient<T>() where T : ClientBase<T>
         {
-            var channelManager = GrpcExtensions.ServiceProvider.GetService<ChannelManager>();
+            var channelManager = GrpcExtensions.ServiceProvider.GetService<ChannelPool>();
             var bindFlags = BindingFlags.Static | BindingFlags.NonPublic;
             var grpcServiceName = typeof(T).DeclaringType.GetFieldValue<string>("__ServiceName", bindFlags);
 

diff --git a/src/Grpc.Extension/Internal/ServerBuilder.cs b/src/Grpc.Extension/Internal/ServerBuilder.cs
@@ -201,7 +201,7 @@ private void CheckUseJaeger()
         /// <returns></returns>
         public Server Build()
         {
-            Server server = new Server();
+            Server server = new Server(GrpcServerOptions.Instance.ChannelOptions);
             //使用拦截器
             var serviceDefinitions = ApplyInterceptor(_serviceDefinitions, _interceptors);
             //添加服务定义

diff --git a/src/Grpc.Extension/Model/ChannelConfig.cs b/src/Grpc.Extension/Model/ChannelConfig.cs
@@ -1,4 +1,5 @@
-using System;
+using Grpc.Core;
+using System.Collections.Generic;
 
 namespace Grpc.Extension.Model
 {
@@ -7,14 +8,34 @@ namespace Grpc.Extension.Model
     /// </summary>
     internal class ChannelConfig
     {
+        /// <summary>
+        /// Discovery的服务器地址
+        /// </summary>
         public string DiscoveryUrl { get; set; }
 
+        /// <summary>
+        /// Discovery上客户端服务名字
+        /// </summary>
         public string DiscoveryServiceName { get; set; }
 
+        /// <summary>
+        /// 直接服务地址，不用服务现
+        /// </summary>
         public string DirectEndpoint { get; set; }
 
+        /// <summary>
+        /// 是否使用直接服务地址
+        /// </summary>
         public bool UseDirect { get; set; }
 
-        public string GrpcServiceName { get; set; }
+        /// <summary>
+        /// ChannelOption
+        /// </summary>
+        public IEnumerable<ChannelOption> ChannelOptions { get; set; }
+
+        /// <summary>
+        /// GrpcServiceName
+        /// </summary>
+        internal string GrpcServiceName { get; set; }
     }
 }
diff --git a/src/Grpc.Extension/Options/GrpcServerOptions.cs b/src/Grpc.Extension/Options/GrpcServerOptions.cs
@@ -1,4 +1,5 @@
-using System;
+using Grpc.Core;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -45,6 +46,11 @@ internal static GrpcServerOptions Instance
         /// </summary>
         public int DefaultErrorCode { get; set; } = 1;
 
+        /// <summary>
+        /// ChannelOption
+        /// </summary>
+        public IEnumerable<ChannelOption> ChannelOptions { get; set; }
+
         #region 兼容老版本
         /*
         /// <summary>

diff --git a/src/Grpc.Extension/ServiceCollectionExtensions.cs b/src/Grpc.Extension/ServiceCollectionExtensions.cs
@@ -54,7 +54,7 @@ public static IServiceCollection AddGrpcClientExtensions(this IServiceCollection
             services.AddSingleton<AutoChannelCallInvoker>();
             services.AddSingleton<CallInvoker, InterceptorCallInvoker>();
             //添加Channel的Manager
-            services.AddSingleton<ChannelManager>();
+            services.AddSingleton<ChannelPool>();
             services.AddSingleton<GrpcClientManager>();
 
             //默认使用轮询负载策略，在外面可以注入其它策略
@@ -88,20 +88,22 @@ public static IServiceCollection AddGrpcClientExtensions(this IServiceCollection
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="services"></param>
-        /// <param name="discoveryUrl"></param>
-        /// <param name="discoveryServiceName"></param>
+        /// <param name="discoveryUrl">Discovery的服务器地址</param>
+        /// <param name="discoveryServiceName">Discovery上客户端服务名字</param>
+        /// <param name="channelOptions">ChannelOption</param>
         /// <returns></returns>
-        public static IServiceCollection AddGrpcClient<T>(this IServiceCollection services, string discoveryUrl, string discoveryServiceName) where T : ClientBase<T>
+        public static IServiceCollection AddGrpcClient<T>(this IServiceCollection services, string discoveryUrl, string discoveryServiceName, IEnumerable<ChannelOption> channelOptions = null) where T : ClientBase<T>
         {
             services.AddSingleton<T>();
             var channelConfig = new ChannelConfig
             {
                 DiscoveryUrl = discoveryUrl,
-                DiscoveryServiceName = discoveryServiceName
+                DiscoveryServiceName = discoveryServiceName,
+                ChannelOptions = channelOptions
             };
             var bindFlags = BindingFlags.Static | BindingFlags.NonPublic;
             channelConfig.GrpcServiceName = typeof(T).DeclaringType.GetFieldValue<string>("__ServiceName", bindFlags);
-            ChannelManager.Configs.Add(channelConfig);
+            ChannelPool.Configs.Add(channelConfig);
             return services;
         }