简化Server ChannelOption配制，统一在UseGrpcOptions配制

yileicn · Sep 1, 2019 · bfd1580 · bfd1580
1 parent 8eb4bdc
commit bfd1580
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/src/Grpc.Extension/Grpc.Extension.xml b/src/Grpc.Extension/Grpc.Extension.xml
diff --git a/src/Grpc.Extension/Options/GrpcServerOptions.cs b/src/Grpc.Extension/Options/GrpcServerOptions.cs
@@ -1,4 +1,5 @@
-using Grpc.Extension.Abstract.Model;
+using Grpc.Core;
+using Grpc.Extension.Abstract.Model;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -49,6 +50,11 @@ public int DefaultErrorCode
             get { return GrpcErrorCode.DefaultErrorCode; }
             set { GrpcErrorCode.DefaultErrorCode = value; }
         }
+
+        /// <summary>
+        /// ChannelOption
+        /// </summary>
+        public IEnumerable<ChannelOption> ChannelOptions { get; set; }
     }
 
 }
diff --git a/src/Grpc.Extension/ServerBuilder.cs b/src/Grpc.Extension/ServerBuilder.cs
@@ -27,7 +27,6 @@ public class ServerBuilder
         private readonly List<ServerInterceptor> _interceptors = new List<ServerInterceptor>();
         private readonly List<ServerServiceDefinition> _serviceDefinitions = new List<ServerServiceDefinition>();
         private readonly List<IGrpcService> _grpcServices = new List<IGrpcService>();
-        private IEnumerable<ChannelOption> _channelOptions;
 
         /// <summary>
         /// ServerBuilder
@@ -225,17 +224,6 @@ private void CheckUseJaeger()
             if (tracer != null) GlobalTracer.Register(tracer);
         }
 
-        /// <summary>
-        /// 配制ChannelOptions
-        /// </summary>
-        /// <param name="channelOptions"></param>
-        /// <returns></returns>
-        public ServerBuilder UseChannelOptions(IEnumerable<ChannelOption> channelOptions)
-        {
-            _channelOptions = channelOptions;
-            return this;
-        }
-
         /// <summary>
         /// 构建Server
         /// </summary>
@@ -246,7 +234,7 @@ public Server Build()
             if (string.IsNullOrWhiteSpace(GrpcServerOptions.Instance.ServiceAddress))
                 throw new ArgumentException(@"GrpcServer:ServiceAddress is null");
 
-            Server server = new Server(_channelOptions);
+            Server server = new Server(GrpcServerOptions.Instance.ChannelOptions);
             //使用拦截器
             var serviceDefinitions = ApplyInterceptor(_serviceDefinitions, _interceptors);
             //添加服务定义