Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
CAP
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
CAP
Commits
a1bec855
Commit
a1bec855
authored
Jul 30, 2017
by
Savorboard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace any Task.Result calls with Task.GetAwaiter().GetResult()
parent
55bfc402
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
11 deletions
+11
-11
PublishQueueExecutor.cs
src/DotNetCore.CAP.Kafka/PublishQueueExecutor.cs
+6
-6
RabbitMQConsumerClient.cs
src/DotNetCore.CAP.RabbitMQ/RabbitMQConsumerClient.cs
+1
-1
IBootstrapper.Default.cs
src/DotNetCore.CAP/IBootstrapper.Default.cs
+1
-1
IConsumerHandler.Default.cs
src/DotNetCore.CAP/IConsumerHandler.Default.cs
+1
-1
DatabaseTestHost.cs
test/DotNetCore.CAP.MySql.Test/DatabaseTestHost.cs
+1
-1
DatabaseTestHost.cs
test/DotNetCore.CAP.SqlServer.Test/DatabaseTestHost.cs
+1
-1
No files found.
src/DotNetCore.CAP.Kafka/PublishQueueExecutor.cs
View file @
a1bec855
...
@@ -21,7 +21,7 @@ namespace DotNetCore.CAP.Kafka
...
@@ -21,7 +21,7 @@ namespace DotNetCore.CAP.Kafka
_kafkaOptions
=
options
;
_kafkaOptions
=
options
;
}
}
public
override
Task
<
OperateResult
>
PublishAsync
(
string
keyName
,
string
content
)
public
override
async
Task
<
OperateResult
>
PublishAsync
(
string
keyName
,
string
content
)
{
{
try
try
{
{
...
@@ -29,21 +29,21 @@ namespace DotNetCore.CAP.Kafka
...
@@ -29,21 +29,21 @@ namespace DotNetCore.CAP.Kafka
var
contentBytes
=
Encoding
.
UTF8
.
GetBytes
(
content
);
var
contentBytes
=
Encoding
.
UTF8
.
GetBytes
(
content
);
using
(
var
producer
=
new
Producer
(
config
))
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
)
if
(!
message
.
Error
.
HasError
)
{
{
_logger
.
LogDebug
(
$"kafka topic message [
{
keyName
}
] has been published."
);
_logger
.
LogDebug
(
$"kafka topic message [
{
keyName
}
] has been published."
);
return
Task
.
FromResult
(
OperateResult
.
Success
)
;
return
OperateResult
.
Success
;
}
}
else
else
{
{
return
Task
.
FromResult
(
OperateResult
.
Failed
(
new
OperateError
return
OperateResult
.
Failed
(
new
OperateError
{
{
Code
=
message
.
Error
.
Code
.
ToString
(),
Code
=
message
.
Error
.
Code
.
ToString
(),
Description
=
message
.
Error
.
Reason
Description
=
message
.
Error
.
Reason
})
)
;
});
}
}
}
}
}
}
...
@@ -51,7 +51,7 @@ namespace DotNetCore.CAP.Kafka
...
@@ -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
}
"
);
_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
);
}
}
}
}
}
}
...
...
src/DotNetCore.CAP.RabbitMQ/RabbitMQConsumerClient.cs
View file @
a1bec855
...
@@ -59,7 +59,7 @@ namespace DotNetCore.CAP.RabbitMQ
...
@@ -59,7 +59,7 @@ namespace DotNetCore.CAP.RabbitMQ
_channel
.
BasicConsume
(
_queueName
,
false
,
consumer
);
_channel
.
BasicConsume
(
_queueName
,
false
,
consumer
);
while
(
true
)
while
(
true
)
{
{
Task
.
Delay
(
timeout
,
cancellationToken
).
Wai
t
();
Task
.
Delay
(
timeout
,
cancellationToken
).
GetAwaiter
().
GetResul
t
();
}
}
}
}
...
...
src/DotNetCore.CAP/IBootstrapper.Default.cs
View file @
a1bec855
...
@@ -40,7 +40,7 @@ namespace DotNetCore.CAP
...
@@ -40,7 +40,7 @@ namespace DotNetCore.CAP
_cts
.
Cancel
();
_cts
.
Cancel
();
try
try
{
{
_bootstrappingTask
?.
Wai
t
();
_bootstrappingTask
?.
GetAwaiter
().
GetResul
t
();
}
}
catch
(
OperationCanceledException
ex
)
catch
(
OperationCanceledException
ex
)
{
{
...
...
src/DotNetCore.CAP/IConsumerHandler.Default.cs
View file @
a1bec855
...
@@ -121,7 +121,7 @@ namespace DotNetCore.CAP
...
@@ -121,7 +121,7 @@ namespace DotNetCore.CAP
{
{
StatusName
=
StatusName
.
Scheduled
,
StatusName
=
StatusName
.
Scheduled
,
};
};
messageStore
.
StoreReceivedMessageAsync
(
receivedMessage
).
Wai
t
();
messageStore
.
StoreReceivedMessageAsync
(
receivedMessage
).
GetAwaiter
().
GetResul
t
();
return
receivedMessage
;
return
receivedMessage
;
}
}
...
...
test/DotNetCore.CAP.MySql.Test/DatabaseTestHost.cs
View file @
a1bec855
...
@@ -35,7 +35,7 @@ namespace DotNetCore.CAP.MySql.Test
...
@@ -35,7 +35,7 @@ namespace DotNetCore.CAP.MySql.Test
var
storage
=
GetService
<
MySqlStorage
>();
var
storage
=
GetService
<
MySqlStorage
>();
var
token
=
new
CancellationTokenSource
().
Token
;
var
token
=
new
CancellationTokenSource
().
Token
;
CreateDatabase
();
CreateDatabase
();
storage
.
InitializeAsync
(
token
).
Wai
t
();
storage
.
InitializeAsync
(
token
).
GetAwaiter
().
GetResul
t
();
_sqlObjectInstalled
=
true
;
_sqlObjectInstalled
=
true
;
}
}
}
}
...
...
test/DotNetCore.CAP.SqlServer.Test/DatabaseTestHost.cs
View file @
a1bec855
...
@@ -35,7 +35,7 @@ namespace DotNetCore.CAP.SqlServer.Test
...
@@ -35,7 +35,7 @@ namespace DotNetCore.CAP.SqlServer.Test
var
storage
=
GetService
<
SqlServerStorage
>();
var
storage
=
GetService
<
SqlServerStorage
>();
var
token
=
new
CancellationTokenSource
().
Token
;
var
token
=
new
CancellationTokenSource
().
Token
;
CreateDatabase
();
CreateDatabase
();
storage
.
InitializeAsync
(
token
).
Wai
t
();
storage
.
InitializeAsync
(
token
).
GetAwaiter
().
GetResul
t
();
_sqlObjectInstalled
=
true
;
_sqlObjectInstalled
=
true
;
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment