weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-03-11 08:30:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 补充 ObjectPool Async CancellationToken 参数；#2177

Browse Source
This commit is contained in:
2881099
2025-12-22 23:07:22 +08:00
parent 04a2d95f19
commit 88b4e7693e
25 changed files with 138 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Providers/FreeSql.Provider.MySql/MySqlAdo/MySqlConnectionPool.cs
View File

@@ -1,11 +1,12 @@
using FreeSql.Internal.ObjectPool;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Threading;
#if MySqlConnector
using MySqlConnector;
#else
@@ -148,7 +149,7 @@ namespace FreeSql.MySql
#if net40
#else
async public Task OnGetAsync(Object<DbConnection> obj)
async public Task OnGetAsync(Object<DbConnection> obj, CancellationToken cancellationToken)
{
if (_pool.IsAvailable)
@@ -159,12 +160,12 @@ namespace FreeSql.MySql
throw new Exception(CoreErrorStrings.S_ConnectionStringError_Check(this.Name));
}
if (obj.Value.State != ConnectionState.Open || DateTime.Now.Subtract(obj.LastReturnTime).TotalSeconds > 60 && (await obj.Value.PingAsync()) == false)
if (obj.Value.State != ConnectionState.Open || DateTime.Now.Subtract(obj.LastReturnTime).TotalSeconds > 60 && (await obj.Value.PingAsync(false, cancellationToken)) == false)
{
try
{
await obj.Value.OpenAsync();
await obj.Value.OpenAsync(cancellationToken);
}
catch (Exception ex)
{
@@ -225,11 +226,11 @@ namespace FreeSql.MySql
#if net40
#else
async public static Task<bool> PingAsync(this DbConnection that, bool isThrow = false)
async public static Task<bool> PingAsync(this DbConnection that, bool isThrow = false, CancellationToken cancellationToken = default)
{
try
{
await PingCommand(that).ExecuteNonQueryAsync();
await PingCommand(that).ExecuteNonQueryAsync(cancellationToken);
return true;
}
catch