Merge branch 'dev'

ZeeLyn · Apr 19, 2019 · 86fa9c8 · 86fa9c8
2 parents 8e782fd + c7f72ec
commit 86fa9c8
Show file tree

Hide file tree

Showing 21 changed files with 75 additions and 36 deletions.
diff --git a/samples/GenericHostSample/Program.cs b/samples/GenericHostSample/Program.cs
@@ -1,19 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
+using System.IO;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Uragano.Abstractions.ConsistentHash;
 using Uragano.Consul;
 using Uragano.Core;
 using Uragano.Logging.Exceptionless;
 using Uragano.Remoting.LoadBalancing;
-using Uragano.ZooKeeper;
 
 namespace GenericHostSample
 {

diff --git a/src/Uragano.Abstract/EnvironmentVariableReader.cs b/src/Uragano.Abstract/EnvironmentVariableReader.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Text.RegularExpressions;
 
 namespace Uragano.Abstractions
 {
@@ -9,6 +10,17 @@ public static T Get<T>(string variable, T defaultValue = default)
             var value = Environment.GetEnvironmentVariable(variable);
             if (string.IsNullOrWhiteSpace(value))
                 return defaultValue;
+
+            value = value.ReplaceIpPlaceholder();
+
+            var matches = Regex.Matches(value, "[{](.*?)[}]");
+            if (matches.Count > 0)
+            {
+                foreach (var match in matches)
+                {
+                    value = value.Replace(match.ToString(), Environment.GetEnvironmentVariable(match.ToString().TrimStart('{').TrimEnd('}')));
+                }
+            }
             return (T)Convert.ChangeType(value, typeof(T));
         }
     }

diff --git a/src/Uragano.Abstract/EnvironmentVariables.cs b/src/Uragano.Abstract/EnvironmentVariables.cs
@@ -0,0 +1,31 @@
+namespace Uragano.Abstractions
+{
+    public class EnvironmentVariables
+    {
+        public const string uragano_server_addr = "uragano_server_addr";
+
+        public const string uragano_server_port = "uragano_server_port";
+
+        public const string uragano_server_weight = "uragano_server_weight";
+
+        public const string uragano_service_id = "uragano_service_id";
+
+        public const string uragano_service_name = "uragano_service_name";
+
+        public const string uragano_consul_addr = "uragano_consul_addr";
+
+        public const string uragano_consul_token = "uragano_consul_token";
+
+        public const string uragano_consul_dc = "uragano_consul_dc";
+
+        public const string uragano_consul_timeout = "uragano_consul_timeout";
+
+        public const string uragano_consul_hc_interval = "uragano_consul_hc_interval";
+
+        public const string uragano_zk_addr = "uragano_zk_addr";
+
+        public const string uragano_zk_session_timeout = "uragano_zk_session_timeout";
+
+        public const string uragano_zk_readonly = "uragano_zk_readonly";
+    }
+}
diff --git a/src/Uragano.Abstract/IPHelper.cs b/src/Uragano.Abstract/IPHelper.cs
@@ -8,6 +8,7 @@ namespace Uragano.Abstractions
     public static class IpHelper
     {
         private static readonly long IpABegin, IpAEnd, IpBBegin, IpBEnd, IpCBegin, IpCEnd;
+        private const string LocalIp = "{LOCALIP}";
         static IpHelper()
         {
             IpABegin = ConvertIpToNumber(IPAddress.Parse("192.168.0.0"));
@@ -45,7 +46,9 @@ private static bool InternalIp(IPAddress iPAddress)
 
         public static string ReplaceIpPlaceholder(this string text)
         {
-            return text.Replace("{LocalIP}", GetLocalInternetIp().ToString());
+            if (!text.Contains(LocalIp))
+                return text;
+            return text.Replace(LocalIp, GetLocalInternetIp().ToString());
         }
     }
 }
diff --git a/src/Uragano.Abstract/Uragano.Abstractions.csproj b/src/Uragano.Abstract/Uragano.Abstractions.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>7.1</LangVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.1-preview.407</Version>
+    <Version>0.0.1-preview.408</Version>
     <Description>A simple, high performance RPC library.</Description>
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <PackageTags>Uragano,RPC,DotNetty,Microservice,MessagePack,DynamicProxy</PackageTags>

diff --git a/src/Uragano.Abstract/UraganoSettings.cs b/src/Uragano.Abstract/UraganoSettings.cs
@@ -25,13 +25,13 @@ public class UraganoSettings
     public class ServerSettings
     {
         public string Address { get; set; } =
-            EnvironmentVariableReader.Get("uragano-server-addr", IpHelper.GetLocalInternetIp().ToString());
+            EnvironmentVariableReader.Get(EnvironmentVariables.uragano_server_addr, IpHelper.GetLocalInternetIp().ToString());
 
-        public int Port { get; set; } = EnvironmentVariableReader.Get("uragano-server-port", 5730);
+        public int Port { get; set; } = EnvironmentVariableReader.Get(EnvironmentVariables.uragano_server_port, 5730);
 
         public X509Certificate2 X509Certificate2 { get; set; }
 
-        public int? Weight { get; set; } = EnvironmentVariableReader.Get("uragano-server-weight", 0);
+        public int? Weight { get; set; } = EnvironmentVariableReader.Get(EnvironmentVariables.uragano_server_weight, 0);
 
         public override string ToString()
         {

diff --git a/src/Uragano.Caching.Memory/Uragano.Caching.Memory.csproj b/src/Uragano.Caching.Memory/Uragano.Caching.Memory.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.1-preview.407</Version>
+    <Version>0.0.1-preview.408</Version>
     <Authors>Owen</Authors>
     <Company>Owen</Company>
     <Description>A simple, high performance RPC library.</Description>

diff --git a/src/Uragano.Caching.Redis/Uragano.Caching.Redis.csproj b/src/Uragano.Caching.Redis/Uragano.Caching.Redis.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.1-preview.407</Version>
+    <Version>0.0.1-preview.408</Version>
     <Authors>Owen</Authors>
     <Company>Owen</Company>
     <Description>A simple, high performance RPC library.</Description>

diff --git a/src/Uragano.Codec.MessagePack/Uragano.Codec.MessagePack.csproj b/src/Uragano.Codec.MessagePack/Uragano.Codec.MessagePack.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.1-preview.407</Version>
+    <Version>0.0.1-preview.408</Version>
     <Description>A simple, high performance RPC library.</Description>
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <PackageIconUrl>https://github.com/1100100/Uragano/blob/master/icon.png?raw=true</PackageIconUrl>

diff --git a/src/Uragano.Consul/ConsulClientConfigure.cs b/src/Uragano.Consul/ConsulClientConfigure.cs
@@ -9,10 +9,10 @@ public class ConsulClientConfigure : ConsulClientConfiguration, IServiceDiscover
     {
         public ConsulClientConfigure()
         {
-            Address = new Uri(EnvironmentVariableReader.Get("uragano-consul-addr", "http://127.0.0.1:8500"));
-            Token = EnvironmentVariableReader.Get<string>("uragano-consul-token");
-            Datacenter = EnvironmentVariableReader.Get("uragano-consul-dc", "dc1");
-            WaitTime = TimeSpan.FromSeconds(EnvironmentVariableReader.Get("uragano-consul-timeout", 10));
+            Address = new Uri(EnvironmentVariableReader.Get(EnvironmentVariables.uragano_consul_addr, "http://127.0.0.1:8500"));
+            Token = EnvironmentVariableReader.Get<string>(EnvironmentVariables.uragano_consul_token);
+            Datacenter = EnvironmentVariableReader.Get(EnvironmentVariables.uragano_consul_dc, "dc1");
+            WaitTime = TimeSpan.FromSeconds(EnvironmentVariableReader.Get(EnvironmentVariables.uragano_consul_timeout, 10));
         }
     }
 }
diff --git a/src/Uragano.Consul/ConsulRegisterServiceConfiguration.cs b/src/Uragano.Consul/ConsulRegisterServiceConfiguration.cs
@@ -7,9 +7,9 @@ namespace Uragano.Consul
 {
     public class ConsulRegisterServiceConfiguration : IServiceRegisterConfiguration
     {
-        public string Id { get; set; } = EnvironmentVariableReader.Get<string>("uragano-service-id");
+        public string Id { get; set; } = EnvironmentVariableReader.Get<string>(EnvironmentVariables.uragano_service_id);
 
-        public string Name { get; set; } = EnvironmentVariableReader.Get<string>("uragano-service-name");
+        public string Name { get; set; } = EnvironmentVariableReader.Get<string>(EnvironmentVariables.uragano_service_name);
 
         public bool EnableTagOverride { get; set; }
 
@@ -20,6 +20,6 @@ public class ConsulRegisterServiceConfiguration : IServiceRegisterConfiguration
         /// <summary>
         /// The default is 10 seconds
         /// </summary>
-        public TimeSpan HealthCheckInterval { get; set; } = TimeSpan.FromSeconds(EnvironmentVariableReader.Get("uragano-consul-hc-interval", 10));
+        public TimeSpan HealthCheckInterval { get; set; } = TimeSpan.FromSeconds(EnvironmentVariableReader.Get(EnvironmentVariables.uragano_consul_hc_interval, 10));
     }
 }
diff --git a/src/Uragano.Consul/Uragano.Consul.csproj b/src/Uragano.Consul/Uragano.Consul.csproj
@@ -8,7 +8,7 @@
     <PackageTags>Uragano,RPC,DotNetty,Microservice,MessagePack,DynamicProxy</PackageTags>
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <Description>A simple, high performance RPC library.</Description>
-    <Version>0.0.1-preview.407</Version>
+    <Version>0.0.1-preview.408</Version>
     <PackageLicenseUrl>https://github.com/1100100/Uragano/blob/master/LICENSE</PackageLicenseUrl>
     <Authors>Owen</Authors>
     <Company>Owen</Company>

diff --git a/src/Uragano.Core/Uragano.Core.csproj b/src/Uragano.Core/Uragano.Core.csproj
@@ -7,7 +7,7 @@
     <PackageIconUrl>https://github.com/1100100/Uragano/blob/master/icon.png?raw=true</PackageIconUrl>
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <Description>A simple, high performance RPC library.</Description>
-    <Version>0.0.1-preview.407</Version>
+    <Version>0.0.1-preview.408</Version>
     <PackageLicenseUrl>https://github.com/1100100/Uragano/blob/master/LICENSE</PackageLicenseUrl>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Owen</Authors>

diff --git a/src/Uragano.DynamicProxy/Uragano.DynamicProxy.csproj b/src/Uragano.DynamicProxy/Uragano.DynamicProxy.csproj
@@ -8,7 +8,7 @@
     <PackageIconUrl>https://github.com/1100100/Uragano/blob/master/icon.png?raw=true</PackageIconUrl>
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <Description>A simple, high performance RPC library.</Description>
-    <Version>0.0.1-preview.407</Version>
+    <Version>0.0.1-preview.408</Version>
     <PackageLicenseUrl>https://github.com/1100100/Uragano/blob/master/LICENSE</PackageLicenseUrl>
     <Authors>Owen</Authors>
     <Company>Owen</Company>

diff --git a/src/Uragano.Logging.Exceptionless/Uragano.Logging.Exceptionless.csproj b/src/Uragano.Logging.Exceptionless/Uragano.Logging.Exceptionless.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.1-preview.407</Version>
+    <Version>0.0.1-preview.408</Version>
     <Authors>Owen</Authors>
     <Company>Owen</Company>
     <Description>A simple, high performance RPC library.</Description>

diff --git a/src/Uragano.Logging.Log4net/Uragano.Logging.Log4Net.csproj b/src/Uragano.Logging.Log4net/Uragano.Logging.Log4Net.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.1-preview.407</Version>
+    <Version>0.0.1-preview.408</Version>
     <Authors>Owen</Authors>
     <Company>Owen</Company>
     <Description>A simple, high performance RPC library.</Description>

diff --git a/src/Uragano.Logging.NLog/Uragano.Logging.NLog.csproj b/src/Uragano.Logging.NLog/Uragano.Logging.NLog.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>0.0.1-preview.407</Version>
+    <Version>0.0.1-preview.408</Version>
     <Authors>Owen</Authors>
     <Company>Owen</Company>
     <Description>A simple, high performance RPC library.</Description>

diff --git a/src/Uragano.Remoting/Uragano.Remoting.csproj b/src/Uragano.Remoting/Uragano.Remoting.csproj
@@ -8,7 +8,7 @@
     <PackageIconUrl>https://github.com/1100100/Uragano/blob/master/icon.png?raw=true</PackageIconUrl>
     <PackageProjectUrl>https://github.com/1100100/Uragano</PackageProjectUrl>
     <Description>A simple, high performance RPC library.</Description>
-    <Version>0.0.1-preview.407</Version>
+    <Version>0.0.1-preview.408</Version>
     <PackageLicenseUrl>https://github.com/1100100/Uragano/blob/master/LICENSE</PackageLicenseUrl>
     <Authors>Owen</Authors>
     <Company>Owen</Company>

diff --git a/src/Uragano.ZooKeeper/Uragano.ZooKeeper.csproj b/src/Uragano.ZooKeeper/Uragano.ZooKeeper.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <Version>0.0.1-preview.407</Version>
+    <Version>0.0.1-preview.408</Version>
     <Authors>Owen</Authors>
     <Product>Uragano.ZooKeeper</Product>
     <Description>A simple, high performance RPC library.</Description>

diff --git a/src/Uragano.ZooKeeper/ZooKeeperClientConfigure.cs b/src/Uragano.ZooKeeper/ZooKeeperClientConfigure.cs
@@ -9,12 +9,12 @@ public class ZooKeeperClientConfigure : IServiceDiscoveryClientConfiguration
         /// comma separated host:port pairs, each corresponding to a zk server.
         /// </summary>
         public string ConnectionString { get; set; } =
-            EnvironmentVariableReader.Get("uragano-zk-addr", "localhost:2181");
+            EnvironmentVariableReader.Get(EnvironmentVariables.uragano_zk_addr, "127.0.0.1:2181");
 
         /// <summary>
         /// session timeout in milliseconds
         /// </summary>
-        public int SessionTimeout { get; set; } = EnvironmentVariableReader.Get("uragano-zk-session-timeout", 1000 * 10);
+        public int SessionTimeout { get; set; } = EnvironmentVariableReader.Get(EnvironmentVariables.uragano_zk_session_timeout, 1000 * 10);
 
 
         /// <summary>
@@ -23,6 +23,6 @@ public class ZooKeeperClientConfigure : IServiceDiscoveryClientConfiguration
         /// server it could reach, it connects to one in read-only mode, i.e. read requests are allowed while write requests are not.
         /// It continues seeking for majority in the background.
         /// </summary>
-        public bool CanBeReadOnly { get; set; } = EnvironmentVariableReader.Get("uragano-zk-readonly", false);
+        public bool CanBeReadOnly { get; set; } = EnvironmentVariableReader.Get(EnvironmentVariables.uragano_zk_readonly, false);
     }
 }
diff --git a/src/Uragano.ZooKeeper/ZooKeeperRegisterServiceConfiguration.cs b/src/Uragano.ZooKeeper/ZooKeeperRegisterServiceConfiguration.cs
@@ -5,8 +5,8 @@ namespace Uragano.ZooKeeper
 {
     public class ZooKeeperRegisterServiceConfiguration : IServiceRegisterConfiguration
     {
-        public string Id { get; set; } = EnvironmentVariableReader.Get<string>("uragano-service-id");
-        public string Name { get; set; } = EnvironmentVariableReader.Get<string>("uragano-service-name");
+        public string Id { get; set; } = EnvironmentVariableReader.Get<string>(EnvironmentVariables.uragano_service_id);
+        public string Name { get; set; } = EnvironmentVariableReader.Get<string>(EnvironmentVariables.uragano_service_name);
 
         public override string ToString()
         {