Commit a1bec855 authored by Savorboard's avatar Savorboard

Replace any Task.Result calls with Task.GetAwaiter().GetResult()

parent 55bfc402
......@@ -21,7 +21,7 @@ namespace DotNetCore.CAP.Kafka
_kafkaOptions = options;
}
public override Task<OperateResult> PublishAsync(string keyName, string content)
public override async Task<OperateResult> PublishAsync(string keyName, string content)
{
try
{
......@@ -29,21 +29,21 @@ namespace DotNetCore.CAP.Kafka
var contentBytes = Encoding.UTF8.GetBytes(content);
using (var producer = new Producer(config))
{
var message = producer.ProduceAsync(keyName, null, contentBytes).Result;
var message = await producer.ProduceAsync(keyName, null, contentBytes);
if (!message.Error.HasError)
{
_logger.LogDebug($"kafka topic message [{keyName}] has been published.");
return Task.FromResult(OperateResult.Success);
return OperateResult.Success;
}
else
{
return Task.FromResult(OperateResult.Failed(new OperateError
return OperateResult.Failed(new OperateError
{
Code = message.Error.Code.ToString(),
Description = message.Error.Reason
}));
});
}
}
}
......@@ -51,7 +51,7 @@ namespace DotNetCore.CAP.Kafka
{
_logger.LogError($"kafka topic message [{keyName}] has benn raised an exception of sending. the exception is: {ex.Message}");
return Task.FromResult(OperateResult.Failed(ex));
return OperateResult.Failed(ex);
}
}
}
......
......@@ -59,7 +59,7 @@ namespace DotNetCore.CAP.RabbitMQ
_channel.BasicConsume(_queueName, false, consumer);
while (true)
{
Task.Delay(timeout, cancellationToken).Wait();
Task.Delay(timeout, cancellationToken).GetAwaiter().GetResult();
}
}
......
......@@ -40,7 +40,7 @@ namespace DotNetCore.CAP
_cts.Cancel();
try
{
_bootstrappingTask?.Wait();
_bootstrappingTask?.GetAwaiter().GetResult();
}
catch (OperationCanceledException ex)
{
......
......@@ -121,7 +121,7 @@ namespace DotNetCore.CAP
{
StatusName = StatusName.Scheduled,
};
messageStore.StoreReceivedMessageAsync(receivedMessage).Wait();
messageStore.StoreReceivedMessageAsync(receivedMessage).GetAwaiter().GetResult();
return receivedMessage;
}
......
......@@ -35,7 +35,7 @@ namespace DotNetCore.CAP.MySql.Test
var storage = GetService<MySqlStorage>();
var token = new CancellationTokenSource().Token;
CreateDatabase();
storage.InitializeAsync(token).Wait();
storage.InitializeAsync(token).GetAwaiter().GetResult();
_sqlObjectInstalled = true;
}
}
......
......@@ -35,7 +35,7 @@ namespace DotNetCore.CAP.SqlServer.Test
var storage = GetService<SqlServerStorage>();
var token = new CancellationTokenSource().Token;
CreateDatabase();
storage.InitializeAsync(token).Wait();
storage.InitializeAsync(token).GetAwaiter().GetResult();
_sqlObjectInstalled = true;
}
}
......
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