- 修复 读写分离创建 IFreeSql 时如果从库不可用导致 iis 退出的 bug；

28810 · 28810 · commit 780b963267cb · 2020-03-04T13:10:17.000+08:00
diff --git a/Examples/dbcontext_01/Controllers/ValuesController.cs b/Examples/dbcontext_01/Controllers/ValuesController.cs
@@ -235,9 +235,9 @@ async public Task<string> Get()
 
         // GET api/values/5
         [HttpGet("{id}")]
-        public ActionResult<string> Get(int id)
+        public ActionResult<object> Get(int id)
         {
-            return "value";
+            return _orm.Select<Song>().Where(a => a.Id == id).First();
         }
 
         // POST api/values
diff --git a/Examples/dbcontext_01/Startup.cs b/Examples/dbcontext_01/Startup.cs
@@ -20,6 +20,9 @@ public Startup(IConfiguration configuration, ILoggerFactory loggerFactory)
                 .UseConnectionString(FreeSql.DataType.Sqlite, @"Data Source=|DataDirectory|\document2.db;Pooling=true;Max Pool Size=10")
                 //.UseConnectionString(FreeSql.DataType.SqlServer, "Data Source=.;Integrated Security=True;Initial Catalog=freesqlTest;Pooling=true;Max Pool Size=10")
 
+                //.UseConnectionString(DataType.MySql, "Data Source=192.168.164.10;Port=33061;User ID=root;Password=123456;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=5")
+                //.UseSlave("Data Source=192.168.164.10;Port=33062;User ID=root;Password=123456;Initial Catalog=cccddd;Charset=utf8;SslMode=none;Max pool size=5")
+
                 //.UseConnectionString(FreeSql.DataType.Oracle, "user id=user1;password=123456;data source=//127.0.0.1:1521/XE;Pooling=true;Max Pool Size=10")
                 //.UseSyncStructureToUpper(true)
 
diff --git a/Examples/dbcontext_01/dbcontext_01.csproj b/Examples/dbcontext_01/dbcontext_01.csproj
@@ -12,6 +12,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Extensions\FreeSql.Extensions.LazyLoading\FreeSql.Extensions.LazyLoading.csproj" />
     <ProjectReference Include="..\..\FreeSql.DbContext\FreeSql.DbContext.csproj" />
+    <ProjectReference Include="..\..\Providers\FreeSql.Provider.MySql\FreeSql.Provider.MySql.csproj" />
     <ProjectReference Include="..\..\Providers\FreeSql.Provider.Sqlite\FreeSql.Provider.Sqlite.csproj" />
   </ItemGroup>
 
diff --git a/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs b/Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs
@@ -19,16 +19,15 @@ class MsAccessConnectionPool : ObjectPool<DbConnection>
 
         public MsAccessConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)
         {
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
             var policy = new AccessConnectionPoolPolicy
             {
                 _pool = this,
                 Name = name
             };
             this.Policy = policy;
             policy.ConnectionString = connectionString;
-
-            this.availableHandler = availableHandler;
-            this.unavailableHandler = unavailableHandler;
         }
 
         public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)
diff --git a/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs b/Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs
@@ -19,16 +19,15 @@ class MySqlConnectionPool : ObjectPool<DbConnection>
 
         public MySqlConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)
         {
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
             var policy = new MySqlConnectionPoolPolicy
             {
                 _pool = this,
                 Name = name
             };
             this.Policy = policy;
             policy.ConnectionString = connectionString;
-
-            this.availableHandler = availableHandler;
-            this.unavailableHandler = unavailableHandler;
         }
 
         public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)
diff --git a/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs
@@ -23,16 +23,15 @@ public OdbcDamengConnectionPool(string name, string connectionString, Action ava
         {
             this.UserId = OdbcDamengConnectionPool.GetUserId(connectionString);
 
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
             var policy = new OdbcOracleConnectionPoolPolicy
             {
                 _pool = this,
                 Name = name
             };
             this.Policy = policy;
             policy.ConnectionString = connectionString;
-
-            this.availableHandler = availableHandler;
-            this.unavailableHandler = unavailableHandler;
         }
 
         public static string GetUserId(string connectionString)
diff --git a/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs
@@ -19,16 +19,15 @@ class OdbcConnectionPool : ObjectPool<DbConnection>
 
         public OdbcConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)
         {
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
             var policy = new OdbcConnectionPoolPolicy
             {
                 _pool = this,
                 Name = name
             };
             this.Policy = policy;
             policy.ConnectionString = connectionString;
-
-            this.availableHandler = availableHandler;
-            this.unavailableHandler = unavailableHandler;
         }
 
         public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)
diff --git a/Providers/FreeSql.Provider.Odbc/GBase/OdbcGBaseAdo/OdbcGBaseConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/GBase/OdbcGBaseAdo/OdbcGBaseConnectionPool.cs
@@ -22,16 +22,15 @@ class OdbcGBaseConnectionPool : ObjectPool<DbConnection>
 
         public OdbcGBaseConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)
         {
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
             var policy = new OdbcPostgreSQLConnectionPoolPolicy
             {
                 _pool = this,
                 Name = name
             };
             this.Policy = policy;
             policy.ConnectionString = connectionString;
-
-            this.availableHandler = availableHandler;
-            this.unavailableHandler = unavailableHandler;
         }
 
         public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)
diff --git a/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs
@@ -19,16 +19,15 @@ class OdbcMySqlConnectionPool : ObjectPool<DbConnection>
 
         public OdbcMySqlConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)
         {
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
             var policy = new OdbcMySqlConnectionPoolPolicy
             {
                 _pool = this,
                 Name = name
             };
             this.Policy = policy;
             policy.ConnectionString = connectionString;
-
-            this.availableHandler = availableHandler;
-            this.unavailableHandler = unavailableHandler;
         }
 
         public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)
diff --git a/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs
@@ -23,16 +23,15 @@ public OdbcOracleConnectionPool(string name, string connectionString, Action ava
         {
             this.UserId = OdbcOracleConnectionPool.GetUserId(connectionString);
 
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
             var policy = new OdbcOracleConnectionPoolPolicy
             {
                 _pool = this,
                 Name = name
             };
             this.Policy = policy;
             policy.ConnectionString = connectionString;
-
-            this.availableHandler = availableHandler;
-            this.unavailableHandler = unavailableHandler;
         }
 
         public static string GetUserId(string connectionString)
diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs
@@ -20,16 +20,15 @@ class OdbcPostgreSQLConnectionPool : ObjectPool<DbConnection>
 
         public OdbcPostgreSQLConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)
         {
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
             var policy = new OdbcPostgreSQLConnectionPoolPolicy
             {
                 _pool = this,
                 Name = name
             };
             this.Policy = policy;
             policy.ConnectionString = connectionString;
-
-            this.availableHandler = availableHandler;
-            this.unavailableHandler = unavailableHandler;
         }
 
         public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)
diff --git a/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs b/Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs
@@ -19,16 +19,15 @@ class OdbcSqlServerConnectionPool : ObjectPool<DbConnection>
 
         public OdbcSqlServerConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)
         {
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
             var policy = new OdbcSqlServerConnectionPoolPolicy
             {
                 _pool = this,
                 Name = name
             };
             this.Policy = policy;
             policy.ConnectionString = connectionString;
-
-            this.availableHandler = availableHandler;
-            this.unavailableHandler = unavailableHandler;
         }
 
         public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)
diff --git a/Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs b/Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs
@@ -21,6 +21,8 @@ class OracleConnectionPool : ObjectPool<DbConnection>
 
         public OracleConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)
         {
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
             this.UserId = OracleConnectionPool.GetUserId(connectionString);
 
             var policy = new OracleConnectionPoolPolicy
@@ -30,9 +32,6 @@ public OracleConnectionPool(string name, string connectionString, Action availab
             };
             this.Policy = policy;
             policy.ConnectionString = connectionString;
-
-            this.availableHandler = availableHandler;
-            this.unavailableHandler = unavailableHandler;
         }
 
         public static string GetUserId(string connectionString)
diff --git a/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs b/Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs
@@ -20,16 +20,15 @@ class PostgreSQLConnectionPool : ObjectPool<DbConnection>
 
         public PostgreSQLConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)
         {
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
             var policy = new PostgreSQLConnectionPoolPolicy
             {
                 _pool = this,
                 Name = name
             };
             this.Policy = policy;
             policy.ConnectionString = connectionString;
-
-            this.availableHandler = availableHandler;
-            this.unavailableHandler = unavailableHandler;
         }
 
         public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)
diff --git a/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs b/Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs
@@ -19,16 +19,15 @@ class SqlServerConnectionPool : ObjectPool<DbConnection>
 
         public SqlServerConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)
         {
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
             var policy = new SqlServerConnectionPoolPolicy
             {
                 _pool = this,
                 Name = name
             };
             this.Policy = policy;
             policy.ConnectionString = connectionString;
-
-            this.availableHandler = availableHandler;
-            this.unavailableHandler = unavailableHandler;
         }
 
         public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)
diff --git a/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs b/Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs
@@ -21,16 +21,15 @@ class SqliteConnectionPool : ObjectPool<DbConnection>
 
         public SqliteConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)
         {
+            this.availableHandler = availableHandler;
+            this.unavailableHandler = unavailableHandler;
             policy = new SqliteConnectionPoolPolicy
             {
                 _pool = this,
                 Name = name
             };
             this.Policy = policy;
             policy.ConnectionString = connectionString;
-
-            this.availableHandler = availableHandler;
-            this.unavailableHandler = unavailableHandler;
         }
 
         public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)

Original file line number	Diff line number	Diff line change
`@@ -235,9 +235,9 @@ async public Task<string> Get()`
`235`	`235`
`236`	`236`	`// GET api/values/5`
`237`	`237`	`[HttpGet("{id}")]`
`238`		`- public ActionResult<string> Get(int id)`
	`238`	`+ public ActionResult<object> Get(int id)`
`239`	`239`	`{`
`240`		`- return "value";`
	`240`	`+ return _orm.Select<Song>().Where(a => a.Id == id).First();`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`// POST api/values`
Original file line number	Diff line number	Diff line change
`@@ -19,16 +19,15 @@ class MsAccessConnectionPool : ObjectPool<DbConnection>`
`19`	`19`
`20`	`20`	`public MsAccessConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)`
`21`	`21`	`{`
	`22`	`+ this.availableHandler = availableHandler;`
	`23`	`+ this.unavailableHandler = unavailableHandler;`
`22`	`24`	`var policy = new AccessConnectionPoolPolicy`
`23`	`25`	`{`
`24`	`26`	`_pool = this,`
`25`	`27`	`Name = name`
`26`	`28`	`};`
`27`	`29`	`this.Policy = policy;`
`28`	`30`	`policy.ConnectionString = connectionString;`
`29`		`-`
`30`		`- this.availableHandler = availableHandler;`
`31`		`- this.unavailableHandler = unavailableHandler;`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)`
Original file line number	Diff line number	Diff line change
`@@ -19,16 +19,15 @@ class MySqlConnectionPool : ObjectPool<DbConnection>`
`19`	`19`
`20`	`20`	`public MySqlConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)`
`21`	`21`	`{`
	`22`	`+ this.availableHandler = availableHandler;`
	`23`	`+ this.unavailableHandler = unavailableHandler;`
`22`	`24`	`var policy = new MySqlConnectionPoolPolicy`
`23`	`25`	`{`
`24`	`26`	`_pool = this,`
`25`	`27`	`Name = name`
`26`	`28`	`};`
`27`	`29`	`this.Policy = policy;`
`28`	`30`	`policy.ConnectionString = connectionString;`
`29`		`-`
`30`		`- this.availableHandler = availableHandler;`
`31`		`- this.unavailableHandler = unavailableHandler;`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)`
Original file line number	Diff line number	Diff line change
`@@ -23,16 +23,15 @@ public OdbcDamengConnectionPool(string name, string connectionString, Action ava`
`23`	`23`	`{`
`24`	`24`	`this.UserId = OdbcDamengConnectionPool.GetUserId(connectionString);`
`25`	`25`
	`26`	`+ this.availableHandler = availableHandler;`
	`27`	`+ this.unavailableHandler = unavailableHandler;`
`26`	`28`	`var policy = new OdbcOracleConnectionPoolPolicy`
`27`	`29`	`{`
`28`	`30`	`_pool = this,`
`29`	`31`	`Name = name`
`30`	`32`	`};`
`31`	`33`	`this.Policy = policy;`
`32`	`34`	`policy.ConnectionString = connectionString;`
`33`		`-`
`34`		`- this.availableHandler = availableHandler;`
`35`		`- this.unavailableHandler = unavailableHandler;`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`public static string GetUserId(string connectionString)`
Original file line number	Diff line number	Diff line change
`@@ -19,16 +19,15 @@ class OdbcConnectionPool : ObjectPool<DbConnection>`
`19`	`19`
`20`	`20`	`public OdbcConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)`
`21`	`21`	`{`
	`22`	`+ this.availableHandler = availableHandler;`
	`23`	`+ this.unavailableHandler = unavailableHandler;`
`22`	`24`	`var policy = new OdbcConnectionPoolPolicy`
`23`	`25`	`{`
`24`	`26`	`_pool = this,`
`25`	`27`	`Name = name`
`26`	`28`	`};`
`27`	`29`	`this.Policy = policy;`
`28`	`30`	`policy.ConnectionString = connectionString;`
`29`		`-`
`30`		`- this.availableHandler = availableHandler;`
`31`		`- this.unavailableHandler = unavailableHandler;`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)`
Original file line number	Diff line number	Diff line change
`@@ -22,16 +22,15 @@ class OdbcGBaseConnectionPool : ObjectPool<DbConnection>`
`22`	`22`
`23`	`23`	`public OdbcGBaseConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)`
`24`	`24`	`{`
	`25`	`+ this.availableHandler = availableHandler;`
	`26`	`+ this.unavailableHandler = unavailableHandler;`
`25`	`27`	`var policy = new OdbcPostgreSQLConnectionPoolPolicy`
`26`	`28`	`{`
`27`	`29`	`_pool = this,`
`28`	`30`	`Name = name`
`29`	`31`	`};`
`30`	`32`	`this.Policy = policy;`
`31`	`33`	`policy.ConnectionString = connectionString;`
`32`		`-`
`33`		`- this.availableHandler = availableHandler;`
`34`		`- this.unavailableHandler = unavailableHandler;`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)`
Original file line number	Diff line number	Diff line change
`@@ -19,16 +19,15 @@ class OdbcMySqlConnectionPool : ObjectPool<DbConnection>`
`19`	`19`
`20`	`20`	`public OdbcMySqlConnectionPool(string name, string connectionString, Action availableHandler, Action unavailableHandler) : base(null)`
`21`	`21`	`{`
	`22`	`+ this.availableHandler = availableHandler;`
	`23`	`+ this.unavailableHandler = unavailableHandler;`
`22`	`24`	`var policy = new OdbcMySqlConnectionPoolPolicy`
`23`	`25`	`{`
`24`	`26`	`_pool = this,`
`25`	`27`	`Name = name`
`26`	`28`	`};`
`27`	`29`	`this.Policy = policy;`
`28`	`30`	`policy.ConnectionString = connectionString;`
`29`		`-`
`30`		`- this.availableHandler = availableHandler;`
`31`		`- this.unavailableHandler = unavailableHandler;`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`public void Return(Object<DbConnection> obj, Exception exception, bool isRecreate = false)`
Original file line number	Diff line number	Diff line change
`@@ -23,16 +23,15 @@ public OdbcOracleConnectionPool(string name, string connectionString, Action ava`
`23`	`23`	`{`
`24`	`24`	`this.UserId = OdbcOracleConnectionPool.GetUserId(connectionString);`
`25`	`25`
	`26`	`+ this.availableHandler = availableHandler;`
	`27`	`+ this.unavailableHandler = unavailableHandler;`
`26`	`28`	`var policy = new OdbcOracleConnectionPoolPolicy`
`27`	`29`	`{`
`28`	`30`	`_pool = this,`
`29`	`31`	`Name = name`
`30`	`32`	`};`
`31`	`33`	`this.Policy = policy;`
`32`	`34`	`policy.ConnectionString = connectionString;`
`33`		`-`
`34`		`- this.availableHandler = availableHandler;`
`35`		`- this.unavailableHandler = unavailableHandler;`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`public static string GetUserId(string connectionString)`