Merge branch 'zhy_feat_cev_v7' into dev

This commit is contained in:
zenghongyao 2025-04-30 15:14:46 +08:00
commit 4bde9be137

View File

@ -183,6 +183,11 @@ namespace JiShe.CollectBus.Kafka.Consumer
_logger.LogError(ex, $"{string.Join("", topics)}消息消费失败: {ex.Error.Reason}"); _logger.LogError(ex, $"{string.Join("", topics)}消息消费失败: {ex.Error.Reason}");
throw; // 抛出异常,以便重试 throw; // 抛出异常,以便重试
} }
catch (KafkaException ex) when (KafkaPollyPipeline.IsRecoverableError(ex))
{
_logger.LogError(ex, $"{string.Join("", topics)} 消息消费失败: {ex.Error.Reason}");
throw; // 抛出异常,以便重试
}
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
//ignore //ignore
@ -403,13 +408,18 @@ namespace JiShe.CollectBus.Kafka.Consumer
_logger.LogError(ex, $"{string.Join("", topics)} 消息消费失败: {ex.Error.Reason}"); _logger.LogError(ex, $"{string.Join("", topics)} 消息消费失败: {ex.Error.Reason}");
throw; // 抛出异常,以便重试 throw; // 抛出异常,以便重试
} }
catch (KafkaException ex) when (KafkaPollyPipeline.IsRecoverableError(ex))
{
_logger.LogError(ex, $"{string.Join("", topics)} 消息消费失败: {ex.Error.Reason}");
throw; // 抛出异常,以便重试
}
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
//ignore //ignore
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "处理批量消息时发生未知错误"); _logger.LogError(ex, "处理批量消息时发生未知错误");
} }
} }
}, cts.Token); }, cts.Token);
@ -540,13 +550,18 @@ namespace JiShe.CollectBus.Kafka.Consumer
_logger.LogError(ex, $"消息消费失败: {ex.Error.Reason}"); _logger.LogError(ex, $"消息消费失败: {ex.Error.Reason}");
throw; // 抛出异常,以便重试 throw; // 抛出异常,以便重试
} }
catch (KafkaException ex) when (KafkaPollyPipeline.IsRecoverableError(ex))
{
_logger.LogError(ex, $"{string.Join("", topics)} 消息消费失败: {ex.Error.Reason}");
throw; // 抛出异常,以便重试
}
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
//ignore //ignore
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "处理批量消息时发生未知错误"); _logger.LogError(ex, "处理批量消息时发生未知错误");
} }
} }
}, cts.Token); }, cts.Token);