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
557c3142
Commit
557c3142
authored
Feb 05, 2020
by
Savorboard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Try to fix transport healthy check bug. #503
parent
c1c4c44e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
14 deletions
+17
-14
AzureServiceBusConsumerClient.cs
...Core.CAP.AzureServiceBus/AzureServiceBusConsumerClient.cs
+3
-3
AzureServiceBusConsumerClientFactory.cs
...P.AzureServiceBus/AzureServiceBusConsumerClientFactory.cs
+3
-1
KafkaConsumerClient.cs
src/DotNetCore.CAP.Kafka/KafkaConsumerClient.cs
+1
-5
KafkaConsumerClientFactory.cs
src/DotNetCore.CAP.Kafka/KafkaConsumerClientFactory.cs
+3
-1
RabbitMQConsumerClient.cs
src/DotNetCore.CAP.RabbitMQ/RabbitMQConsumerClient.cs
+3
-3
RabbitMQConsumerClientFactory.cs
src/DotNetCore.CAP.RabbitMQ/RabbitMQConsumerClientFactory.cs
+3
-1
IConsumerRegister.Default.cs
src/DotNetCore.CAP/Internal/IConsumerRegister.Default.cs
+1
-0
No files found.
src/DotNetCore.CAP.AzureServiceBus/AzureServiceBusConsumerClient.cs
View file @
557c3142
...
...
@@ -109,9 +109,7 @@ namespace DotNetCore.CAP.AzureServiceBus
_consumerClient
?.
CloseAsync
().
Wait
(
1500
);
}
#
region
private
methods
private
async
Task
ConnectAsync
()
public
async
Task
ConnectAsync
()
{
if
(
_consumerClient
!=
null
)
{
...
...
@@ -157,6 +155,8 @@ namespace DotNetCore.CAP.AzureServiceBus
}
}
#
region
private
methods
private
Task
OnConsumerReceived
(
Message
message
,
CancellationToken
token
)
{
var
header
=
message
.
UserProperties
.
ToDictionary
(
x
=>
x
.
Key
,
y
=>
y
.
Value
?.
ToString
());
...
...
src/DotNetCore.CAP.AzureServiceBus/AzureServiceBusConsumerClientFactory.cs
View file @
557c3142
...
...
@@ -25,7 +25,9 @@ namespace DotNetCore.CAP.AzureServiceBus
try
{
var
logger
=
_loggerFactory
.
CreateLogger
(
typeof
(
AzureServiceBusConsumerClient
));
return
new
AzureServiceBusConsumerClient
(
logger
,
groupId
,
_asbOptions
);
var
client
=
new
AzureServiceBusConsumerClient
(
logger
,
groupId
,
_asbOptions
);
client
.
ConnectAsync
().
GetAwaiter
().
GetResult
();
return
client
;
}
catch
(
System
.
Exception
e
)
{
...
...
src/DotNetCore.CAP.Kafka/KafkaConsumerClient.cs
View file @
557c3142
...
...
@@ -95,9 +95,7 @@ namespace DotNetCore.CAP.Kafka
_consumerClient
?.
Dispose
();
}
#
region
private
methods
private
void
Connect
()
public
void
Connect
()
{
if
(
_consumerClient
!=
null
)
{
...
...
@@ -134,7 +132,5 @@ namespace DotNetCore.CAP.Kafka
};
OnLog
?.
Invoke
(
null
,
logArgs
);
}
#
endregion
private
methods
}
}
\ No newline at end of file
src/DotNetCore.CAP.Kafka/KafkaConsumerClientFactory.cs
View file @
557c3142
...
...
@@ -19,7 +19,9 @@ namespace DotNetCore.CAP.Kafka
{
try
{
return
new
KafkaConsumerClient
(
groupId
,
_kafkaOptions
);
var
client
=
new
KafkaConsumerClient
(
groupId
,
_kafkaOptions
);
client
.
Connect
();
return
client
;
}
catch
(
System
.
Exception
e
)
{
...
...
src/DotNetCore.CAP.RabbitMQ/RabbitMQConsumerClient.cs
View file @
557c3142
...
...
@@ -95,9 +95,7 @@ namespace DotNetCore.CAP.RabbitMQ
_connection
?.
Dispose
();
}
#
region
events
private
void
Connect
()
public
void
Connect
()
{
if
(
_connection
!=
null
)
{
...
...
@@ -129,6 +127,8 @@ namespace DotNetCore.CAP.RabbitMQ
}
}
#
region
events
private
void
OnConsumerConsumerCancelled
(
object
sender
,
ConsumerEventArgs
e
)
{
var
args
=
new
LogMessageEventArgs
...
...
src/DotNetCore.CAP.RabbitMQ/RabbitMQConsumerClientFactory.cs
View file @
557c3142
...
...
@@ -21,7 +21,9 @@ namespace DotNetCore.CAP.RabbitMQ
{
try
{
return
new
RabbitMQConsumerClient
(
groupId
,
_connectionChannelPool
,
_rabbitMQOptions
);
var
client
=
new
RabbitMQConsumerClient
(
groupId
,
_connectionChannelPool
,
_rabbitMQOptions
);
client
.
Connect
();
return
client
;
}
catch
(
System
.
Exception
e
)
{
...
...
src/DotNetCore.CAP/Internal/IConsumerRegister.Default.cs
View file @
557c3142
...
...
@@ -235,6 +235,7 @@ namespace DotNetCore.CAP.Internal
_logger
.
LogWarning
(
"RabbitMQ consumer unregistered. --> "
+
logmsg
.
Reason
);
break
;
case
MqLogType
.
ConsumerShutdown
:
_isHealthy
=
false
;
_logger
.
LogWarning
(
"RabbitMQ consumer shutdown. --> "
+
logmsg
.
Reason
);
break
;
case
MqLogType
.
ConsumeError
:
...
...
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