Commit 484f6b84 authored by Savorboard's avatar Savorboard

refactor async method.

parent 97cc190c
...@@ -25,18 +25,16 @@ namespace DotNetCore.CAP.MySql ...@@ -25,18 +25,16 @@ namespace DotNetCore.CAP.MySql
_options = options; _options = options;
_logger = logger; _logger = logger;
if (_options.DbContextType != null) if (_options.DbContextType == null) return;
{ IsUsingEF = true;
IsUsingEF = true; _dbContext = (DbContext) ServiceProvider.GetService(_options.DbContextType);
_dbContext = (DbContext) ServiceProvider.GetService(_options.DbContextType);
}
} }
public async Task PublishAsync(CapPublishedMessage message) public Task PublishAsync(CapPublishedMessage message)
{ {
using (var conn = new MySqlConnection(_options.ConnectionString)) using (var conn = new MySqlConnection(_options.ConnectionString))
{ {
await conn.ExecuteAsync(PrepareSql(), message); return conn.ExecuteAsync(PrepareSql(), message);
} }
} }
...@@ -64,12 +62,14 @@ namespace DotNetCore.CAP.MySql ...@@ -64,12 +62,14 @@ namespace DotNetCore.CAP.MySql
_logger.LogInformation("Published Message has been persisted in the database. name:" + message); _logger.LogInformation("Published Message has been persisted in the database. name:" + message);
} }
protected override async Task ExecuteAsync(IDbConnection dbConnection, IDbTransaction dbTransaction, protected override Task ExecuteAsync(IDbConnection dbConnection, IDbTransaction dbTransaction,
CapPublishedMessage message) CapPublishedMessage message)
{ {
await dbConnection.ExecuteAsync(PrepareSql(), message, dbTransaction); dbConnection.ExecuteAsync(PrepareSql(), message, dbTransaction);
_logger.LogInformation("Published Message has been persisted in the database. name:" + message); _logger.LogInformation("Published Message has been persisted in the database. name:" + message);
return Task.CompletedTask;
} }
#region private methods #region private methods
......
...@@ -32,11 +32,11 @@ namespace DotNetCore.CAP.PostgreSql ...@@ -32,11 +32,11 @@ namespace DotNetCore.CAP.PostgreSql
} }
} }
public async Task PublishAsync(CapPublishedMessage message) public Task PublishAsync(CapPublishedMessage message)
{ {
using (var conn = new NpgsqlConnection(_options.ConnectionString)) using (var conn = new NpgsqlConnection(_options.ConnectionString))
{ {
await conn.ExecuteAsync(PrepareSql(), message); return conn.ExecuteAsync(PrepareSql(), message);
} }
} }
...@@ -64,12 +64,14 @@ namespace DotNetCore.CAP.PostgreSql ...@@ -64,12 +64,14 @@ namespace DotNetCore.CAP.PostgreSql
_logger.LogInformation("Published Message has been persisted in the database. name:" + message); _logger.LogInformation("Published Message has been persisted in the database. name:" + message);
} }
protected override async Task ExecuteAsync(IDbConnection dbConnection, IDbTransaction dbTransaction, protected override Task ExecuteAsync(IDbConnection dbConnection, IDbTransaction dbTransaction,
CapPublishedMessage message) CapPublishedMessage message)
{ {
await dbConnection.ExecuteAsync(PrepareSql(), message, dbTransaction); dbConnection.ExecuteAsync(PrepareSql(), message, dbTransaction);
_logger.LogInformation("Published Message has been persisted in the database. name:" + message); _logger.LogInformation("Published Message has been persisted in the database. name:" + message);
return Task.CompletedTask;
} }
#region private methods #region private methods
......
...@@ -38,8 +38,7 @@ namespace DotNetCore.CAP.RabbitMQ ...@@ -38,8 +38,7 @@ namespace DotNetCore.CAP.RabbitMQ
{ {
_maxSize = 0; _maxSize = 0;
IConnection context; while (_pool.TryDequeue(out var context))
while (_pool.TryDequeue(out context))
context.Dispose(); context.Dispose();
} }
......
...@@ -42,14 +42,14 @@ namespace DotNetCore.CAP.RabbitMQ ...@@ -42,14 +42,14 @@ namespace DotNetCore.CAP.RabbitMQ
null, null,
body); body);
_logger.LogDebug($"rabbitmq topic message [{keyName}] has been published."); _logger.LogDebug($"RabbitMQ topic message [{keyName}] has been published.");
} }
return Task.FromResult(OperateResult.Success); return Task.FromResult(OperateResult.Success);
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError( _logger.LogError(
$"rabbitmq topic message [{keyName}] has benn raised an exception of sending. the exception is: {ex.Message}"); $"RabbitMQ topic message [{keyName}] has been raised an exception of sending. the exception is: {ex.Message}");
return Task.FromResult(OperateResult.Failed(ex, return Task.FromResult(OperateResult.Failed(ex,
new OperateError new OperateError
......
...@@ -25,18 +25,17 @@ namespace DotNetCore.CAP.SqlServer ...@@ -25,18 +25,17 @@ namespace DotNetCore.CAP.SqlServer
_logger = logger; _logger = logger;
_options = options; _options = options;
if (_options.DbContextType != null) if (_options.DbContextType == null) return;
{
IsUsingEF = true; IsUsingEF = true;
_dbContext = (DbContext) ServiceProvider.GetService(_options.DbContextType); _dbContext = (DbContext) ServiceProvider.GetService(_options.DbContextType);
}
} }
public async Task PublishAsync(CapPublishedMessage message) public Task PublishAsync(CapPublishedMessage message)
{ {
using (var conn = new SqlConnection(_options.ConnectionString)) using (var conn = new SqlConnection(_options.ConnectionString))
{ {
await conn.ExecuteAsync(PrepareSql(), message); return conn.ExecuteAsync(PrepareSql(), message);
} }
} }
...@@ -64,12 +63,14 @@ namespace DotNetCore.CAP.SqlServer ...@@ -64,12 +63,14 @@ namespace DotNetCore.CAP.SqlServer
_logger.LogInformation("Published Message has been persisted in the database. name:" + message); _logger.LogInformation("Published Message has been persisted in the database. name:" + message);
} }
protected override async Task ExecuteAsync(IDbConnection dbConnection, IDbTransaction dbTransaction, protected override Task ExecuteAsync(IDbConnection dbConnection, IDbTransaction dbTransaction,
CapPublishedMessage message) CapPublishedMessage message)
{ {
await dbConnection.ExecuteAsync(PrepareSql(), message, dbTransaction); dbConnection.ExecuteAsync(PrepareSql(), message, dbTransaction);
_logger.LogInformation("Published Message has been persisted in the database. name:" + message); _logger.LogInformation("Published Message has been persisted in the database. name:" + message);
return Task.CompletedTask;
} }
#region private methods #region private methods
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment