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
46cdfa17
Commit
46cdfa17
authored
Nov 25, 2019
by
Savorboard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Kafka transport check not working bug. #436
parent
72f7094b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
6 deletions
+23
-6
IConnectionPool.Default.cs
src/DotNetCore.CAP.Kafka/IConnectionPool.Default.cs
+1
-1
IConsumerRegister.Default.cs
src/DotNetCore.CAP/Internal/IConsumerRegister.Default.cs
+3
-1
IDispatcher.Default.cs
src/DotNetCore.CAP/Processor/IDispatcher.Default.cs
+5
-1
IProcessor.Collector.cs
src/DotNetCore.CAP/Processor/IProcessor.Collector.cs
+1
-1
IProcessor.TransportCheck.cs
src/DotNetCore.CAP/Processor/IProcessor.TransportCheck.cs
+13
-2
No files found.
src/DotNetCore.CAP.Kafka/IConnectionPool.Default.cs
View file @
46cdfa17
...
...
@@ -24,7 +24,7 @@ namespace DotNetCore.CAP.Kafka
_producerPool
=
new
ConcurrentQueue
<
IProducer
<
string
,
byte
[
]>
>();
_maxSize
=
_options
.
ConnectionPoolSize
;
logger
.
LogDebug
(
"
Kafka configuration of CAP :\r\n {0}"
,
JsonConvert
.
SerializeObject
(
_options
.
AsKafkaConfig
()
));
logger
.
LogDebug
(
"
CAP Kafka configuration: {0}"
,
JsonConvert
.
SerializeObject
(
_options
.
AsKafkaConfig
(),
Formatting
.
Indented
));
}
public
string
ServersAddress
=>
_options
.
Servers
;
...
...
src/DotNetCore.CAP/Internal/IConsumerRegister.Default.cs
View file @
46cdfa17
...
...
@@ -27,8 +27,8 @@ namespace DotNetCore.CAP.Internal
private
readonly
TimeSpan
_pollingDelay
=
TimeSpan
.
FromSeconds
(
1
);
private
readonly
CapOptions
_options
;
private
readonly
MethodMatcherCache
_selector
;
private
readonly
CancellationTokenSource
_cts
;
private
CancellationTokenSource
_cts
;
private
string
_serverAddress
;
private
Task
_compositeTask
;
private
bool
_disposed
;
...
...
@@ -111,6 +111,7 @@ namespace DotNetCore.CAP.Internal
{
Pulse
();
_cts
=
new
CancellationTokenSource
();
_isHealthy
=
true
;
Start
();
...
...
@@ -247,6 +248,7 @@ namespace DotNetCore.CAP.Internal
_logger
.
LogError
(
"Kafka client consume error. --> "
+
logmsg
.
Reason
);
break
;
case
MqLogType
.
ServerConnError
:
_isHealthy
=
false
;
_logger
.
LogCritical
(
"Kafka server connection error. --> "
+
logmsg
.
Reason
);
break
;
case
MqLogType
.
ExceptionReceived
:
...
...
src/DotNetCore.CAP/Processor/IDispatcher.Default.cs
View file @
46cdfa17
...
...
@@ -64,7 +64,11 @@ namespace DotNetCore.CAP.Processor
{
try
{
await
_sender
.
SendAsync
(
message
);
var
result
=
await
_sender
.
SendAsync
(
message
);
if
(!
result
.
Succeeded
)
{
_logger
.
LogWarning
(
result
.
Exception
,
"Message send failed! -->"
+
result
);
}
}
catch
(
Exception
ex
)
{
...
...
src/DotNetCore.CAP/Processor/IProcessor.Collector.cs
View file @
46cdfa17
...
...
@@ -38,7 +38,7 @@ namespace DotNetCore.CAP.Processor
foreach
(
var
table
in
tables
)
{
_logger
.
LogDebug
(
$"Collecting expired data from table
[
{
table
}
].
"
);
_logger
.
LogDebug
(
$"Collecting expired data from table
:
{
table
}
"
);
int
deletedCount
;
var
time
=
DateTime
.
Now
;
...
...
src/DotNetCore.CAP/Processor/IProcessor.TransportCheck.cs
View file @
46cdfa17
...
...
@@ -4,16 +4,19 @@
using
System
;
using
System.Threading.Tasks
;
using
DotNetCore.CAP.Internal
;
using
Microsoft.Extensions.Logging
;
namespace
DotNetCore.CAP.Processor
{
public
class
TransportCheckProcessor
:
IProcessor
{
private
readonly
ILogger
<
TransportCheckProcessor
>
_logger
;
private
readonly
IConsumerRegister
_register
;
private
readonly
TimeSpan
_waitingInterval
;
public
TransportCheckProcessor
(
IConsumerRegister
register
)
public
TransportCheckProcessor
(
I
Logger
<
TransportCheckProcessor
>
logger
,
I
ConsumerRegister
register
)
{
_logger
=
logger
;
_register
=
register
;
_waitingInterval
=
TimeSpan
.
FromSeconds
(
30
);
}
...
...
@@ -25,12 +28,20 @@ namespace DotNetCore.CAP.Processor
throw
new
ArgumentNullException
(
nameof
(
context
));
}
_logger
.
LogDebug
(
"Transport connection checking..."
);
if
(!
_register
.
IsHealthy
())
{
_logger
.
LogWarning
(
"Transport connection is unhealthy, reconnection..."
);
_register
.
ReStart
();
}
else
{
_logger
.
LogDebug
(
"Transport connection healthy!"
);
}
await
context
.
WaitAsync
(
_waitingInterval
);
}
}
}
}
\ No newline at end of file
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