移入 SafeObjectPool 源码

FreeSql/FreeSql.xml

@@ -2982,6 +2982,11 @@
             获取超时后，是否抛出异常
             </summary>
         </member>
+        <member name="P:FreeSql.Internal.ObjectPool.IPolicy`1.IsAutoDisposeWithSystem">
+            <summary>
+            监听 AppDomain.CurrentDomain.ProcessExit/Console.CancelKeyPress 事件自动释放
+            </summary>
+        </member>
         <member name="P:FreeSql.Internal.ObjectPool.IPolicy`1.CheckAvailableInterval">
             <summary>
             后台定时检查可用性间隔秒数

FreeSql/Internal/CommonProvider/AdoProvider/DbConnectionPool.cs

@@ -105,9 +105,10 @@ namespace FreeSql.Internal.CommonProvider
         public string Name { get; set; } = typeof(DbConnectionPoolPolicy).GetType().FullName;
         public int PoolSize { get; set; } = 1000;
         public TimeSpan SyncGetTimeout { get; set; } = TimeSpan.FromSeconds(10);
-        public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(50);
+        public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20);
         public int AsyncGetCapacity { get; set; } = 10000;
         public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
 
         public DbConnection OnCreate()

FreeSql/Internal/ObjectPool/DefaultPolicy.cs

@@ -15,6 +15,7 @@ namespace FreeSql.Internal.ObjectPool
         public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(50);
         public int AsyncGetCapacity { get; set; } = 10000;
         public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
 
         public Func<T> CreateObject;

FreeSql/Internal/ObjectPool/IPolicy.cs

@@ -38,6 +38,11 @@ namespace FreeSql.Internal.ObjectPool
         /// </summary>
         bool IsThrowGetTimeoutException { get; set; }
 
+        /// <summary>
+        /// 监听 AppDomain.CurrentDomain.ProcessExit/Console.CancelKeyPress 事件自动释放
+        /// </summary>
+        bool IsAutoDisposeWithSystem { get; set; }
+
         /// <summary>
         /// 后台定时检查可用性间隔秒数
         /// </summary>

FreeSql/Internal/ObjectPool/ObjectPool.cs

@@ -241,14 +241,16 @@ namespace FreeSql.Internal.ObjectPool
 
             AppDomain.CurrentDomain.ProcessExit += (s1, e1) =>
             {
-                running = false;
+                if (Policy.IsAutoDisposeWithSystem)
+                    running = false;
             };
             try
             {
                 Console.CancelKeyPress += (s1, e1) =>
                 {
                     if (e1.Cancel) return;
-                    running = false;
+                    if (Policy.IsAutoDisposeWithSystem)
+                        running = false;
                 };
             }
             catch { }

Providers/FreeSql.Provider.MsAccess/MsAccessAdo/MsAccessConnectionPool.cs

@@ -55,6 +55,7 @@ namespace FreeSql.MsAccess
         public TimeSpan IdleTimeout { get; set; } = TimeSpan.Zero;
         public int AsyncGetCapacity { get; set; } = 10000;
         public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
 
         private string _connectionString;

Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs

@@ -50,6 +50,7 @@ namespace FreeSql.MySql
         public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20);
         public int AsyncGetCapacity { get; set; } = 10000;
         public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);

Providers/FreeSql.Provider.Odbc/Dameng/OdbcDamengAdo/OdbcDamengConnectionPool.cs

@@ -72,6 +72,7 @@ namespace FreeSql.Odbc.Dameng
         public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20);
         public int AsyncGetCapacity { get; set; } = 10000;
         public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);

Providers/FreeSql.Provider.Odbc/Default/OdbcAdo/OdbcConnectionPool.cs

@@ -55,6 +55,7 @@ namespace FreeSql.Odbc.Default
         public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20);
         public int AsyncGetCapacity { get; set; } = 10000;
         public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);

Providers/FreeSql.Provider.Odbc/MySql/OdbcMySqlAdo/OdbcMySqlConnectionPool.cs

@@ -50,6 +50,7 @@ namespace FreeSql.Odbc.MySql
         public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20);
         public int AsyncGetCapacity { get; set; } = 10000;
         public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);

Providers/FreeSql.Provider.Odbc/Oracle/OdbcOracleAdo/OdbcOracleConnectionPool.cs

@@ -72,6 +72,7 @@ namespace FreeSql.Odbc.Oracle
         public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20);
         public int AsyncGetCapacity { get; set; } = 10000;
         public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);

Providers/FreeSql.Provider.Odbc/PostgreSQL/OdbcPostgreSQLAdo/OdbcPostgreSQLConnectionPool.cs

@@ -62,6 +62,7 @@ namespace FreeSql.Odbc.PostgreSQL
         public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20);
         public int AsyncGetCapacity { get; set; } = 10000;
         public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);

Providers/FreeSql.Provider.Odbc/SqlServer/OdbcSqlServerAdo/OdbcSqlServerConnectionPool.cs

@@ -55,6 +55,7 @@ namespace FreeSql.Odbc.SqlServer
         public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20);
         public int AsyncGetCapacity { get; set; } = 10000;
         public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);

Providers/FreeSql.Provider.Oracle/OracleAdo/OracleConnectionPool.cs

@@ -72,6 +72,7 @@ namespace FreeSql.Oracle
         public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20);
         public int AsyncGetCapacity { get; set; } = 10000;
         public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);

Providers/FreeSql.Provider.PostgreSQL/PostgreSQLAdo/PostgreSQLConnectionPool.cs

@@ -62,6 +62,7 @@ namespace FreeSql.PostgreSQL
         public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20);
         public int AsyncGetCapacity { get; set; } = 10000;
         public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);

Providers/FreeSql.Provider.SqlServer/SqlServerAdo/SqlServerConnectionPool.cs

@@ -55,6 +55,7 @@ namespace FreeSql.SqlServer
         public TimeSpan IdleTimeout { get; set; } = TimeSpan.FromSeconds(20);
         public int AsyncGetCapacity { get; set; } = 10000;
         public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
 
         static ConcurrentDictionary<string, int> dicConnStrIncr = new ConcurrentDictionary<string, int>(StringComparer.CurrentCultureIgnoreCase);

Providers/FreeSql.Provider.Sqlite/SqliteAdo/SqliteConnectionPool.cs

@@ -54,6 +54,7 @@ namespace FreeSql.Sqlite
         public TimeSpan IdleTimeout { get; set; } = TimeSpan.Zero;
         public int AsyncGetCapacity { get; set; } = 10000;
         public bool IsThrowGetTimeoutException { get; set; } = true;
+        public bool IsAutoDisposeWithSystem { get; set; } = true;
         public int CheckAvailableInterval { get; set; } = 5;
         public string[] Attaches = new string[0];