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
a3807b6a
Commit
a3807b6a
authored
Sep 30, 2017
by
Savorboard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
when storage a received message raising an eception, we will reject the message to queue.
parent
eb5971bb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
6 deletions
+31
-6
KafkaConsumerClient.cs
src/DotNetCore.CAP.Kafka/KafkaConsumerClient.cs
+13
-2
RabbitMQConsumerClient.cs
src/DotNetCore.CAP.RabbitMQ/RabbitMQConsumerClient.cs
+6
-1
IConsumerClient.cs
src/DotNetCore.CAP/IConsumerClient.cs
+2
-0
IConsumerHandler.Default.cs
src/DotNetCore.CAP/IConsumerHandler.Default.cs
+10
-3
No files found.
src/DotNetCore.CAP.Kafka/KafkaConsumerClient.cs
View file @
a3807b6a
...
@@ -45,6 +45,7 @@ namespace DotNetCore.CAP.Kafka
...
@@ -45,6 +45,7 @@ namespace DotNetCore.CAP.Kafka
cancellationToken
.
ThrowIfCancellationRequested
();
cancellationToken
.
ThrowIfCancellationRequested
();
_consumerClient
.
Poll
(
timeout
);
_consumerClient
.
Poll
(
timeout
);
}
}
// ReSharper disable once FunctionNeverReturns
}
}
public
void
Commit
()
public
void
Commit
()
...
@@ -52,6 +53,11 @@ namespace DotNetCore.CAP.Kafka
...
@@ -52,6 +53,11 @@ namespace DotNetCore.CAP.Kafka
_consumerClient
.
CommitAsync
();
_consumerClient
.
CommitAsync
();
}
}
public
void
Reject
()
{
// Ignore, Kafka will not commit offset when not commit.
}
public
void
Dispose
()
public
void
Dispose
()
{
{
_consumerClient
.
Dispose
();
_consumerClient
.
Dispose
();
...
@@ -65,11 +71,16 @@ namespace DotNetCore.CAP.Kafka
...
@@ -65,11 +71,16 @@ namespace DotNetCore.CAP.Kafka
var
config
=
_kafkaOptions
.
AsKafkaConfig
();
var
config
=
_kafkaOptions
.
AsKafkaConfig
();
_consumerClient
=
new
Consumer
<
Null
,
string
>(
config
,
null
,
StringDeserializer
);
_consumerClient
=
new
Consumer
<
Null
,
string
>(
config
,
null
,
StringDeserializer
);
_consumerClient
.
OnConsumeError
+=
ConsumerClient_OnConsumeError
;
_consumerClient
.
OnMessage
+=
ConsumerClient_OnMessage
;
_consumerClient
.
OnMessage
+=
ConsumerClient_OnMessage
;
_consumerClient
.
OnError
+=
ConsumerClient_OnError
;
_consumerClient
.
OnError
+=
ConsumerClient_OnError
;
}
}
private
void
ConsumerClient_OnConsumeError
(
object
sender
,
Message
e
)
{
OnError
?.
Invoke
(
sender
,
$"Consumer client raised an error. Topic:
{
e
.
Topic
}
, Reason:
{
e
.
Error
}
"
);
}
private
void
ConsumerClient_OnMessage
(
object
sender
,
Message
<
Null
,
string
>
e
)
private
void
ConsumerClient_OnMessage
(
object
sender
,
Message
<
Null
,
string
>
e
)
{
{
var
message
=
new
MessageContext
var
message
=
new
MessageContext
...
@@ -84,7 +95,7 @@ namespace DotNetCore.CAP.Kafka
...
@@ -84,7 +95,7 @@ namespace DotNetCore.CAP.Kafka
private
void
ConsumerClient_OnError
(
object
sender
,
Error
e
)
private
void
ConsumerClient_OnError
(
object
sender
,
Error
e
)
{
{
OnError
?.
Invoke
(
sender
,
e
.
Reason
);
OnError
?.
Invoke
(
sender
,
e
.
ToString
()
);
}
}
#
endregion
private
methods
#
endregion
private
methods
...
...
src/DotNetCore.CAP.RabbitMQ/RabbitMQConsumerClient.cs
View file @
a3807b6a
...
@@ -57,6 +57,11 @@ namespace DotNetCore.CAP.RabbitMQ
...
@@ -57,6 +57,11 @@ namespace DotNetCore.CAP.RabbitMQ
_channel
.
BasicAck
(
_deliveryTag
,
false
);
_channel
.
BasicAck
(
_deliveryTag
,
false
);
}
}
public
void
Reject
()
{
_channel
.
BasicReject
(
_deliveryTag
,
true
);
}
public
void
Dispose
()
public
void
Dispose
()
{
{
_channel
.
Dispose
();
_channel
.
Dispose
();
...
@@ -73,7 +78,7 @@ namespace DotNetCore.CAP.RabbitMQ
...
@@ -73,7 +78,7 @@ namespace DotNetCore.CAP.RabbitMQ
RabbitMQOptions
.
ExchangeType
,
RabbitMQOptions
.
ExchangeType
,
true
);
true
);
var
arguments
=
new
Dictionary
<
string
,
object
>
{
{
"x-message-ttl"
,
_rabbitMQOptions
.
QueueMessageExpires
}
};
var
arguments
=
new
Dictionary
<
string
,
object
>
{
{
"x-message-ttl"
,
_rabbitMQOptions
.
QueueMessageExpires
}
};
_channel
.
QueueDeclare
(
_queueName
,
_channel
.
QueueDeclare
(
_queueName
,
true
,
true
,
false
,
false
,
...
...
src/DotNetCore.CAP/IConsumerClient.cs
View file @
a3807b6a
...
@@ -15,6 +15,8 @@ namespace DotNetCore.CAP
...
@@ -15,6 +15,8 @@ namespace DotNetCore.CAP
void
Commit
();
void
Commit
();
void
Reject
();
event
EventHandler
<
MessageContext
>
OnMessageReceived
;
event
EventHandler
<
MessageContext
>
OnMessageReceived
;
event
EventHandler
<
string
>
OnError
;
event
EventHandler
<
string
>
OnError
;
...
...
src/DotNetCore.CAP/IConsumerHandler.Default.cs
View file @
a3807b6a
...
@@ -91,9 +91,16 @@ namespace DotNetCore.CAP
...
@@ -91,9 +91,16 @@ namespace DotNetCore.CAP
using
(
var
scope
=
_serviceProvider
.
CreateScope
())
using
(
var
scope
=
_serviceProvider
.
CreateScope
())
{
{
StoreMessage
(
scope
,
message
);
try
{
client
.
Commit
();
StoreMessage
(
scope
,
message
);
client
.
Commit
();
}
catch
(
Exception
e
)
{
_logger
.
LogError
(
e
,
"Raised an exception when storage received message。 Message:{0}"
,
message
);
client
.
Reject
();
}
}
}
Pulse
();
Pulse
();
};
};
...
...
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