Przeglądaj źródła

refactor log messages.

undefined
Savorboard 7 lat temu
rodzic
commit
11e7c48eb0
2 zmienionych plików z 39 dodań i 6 usunięć
  1. +15
    -6
      src/DotNetCore.CAP.Kafka/KafkaConsumerClient.cs
  2. +24
    -0
      src/DotNetCore.CAP/MqLogType.cs

+ 15
- 6
src/DotNetCore.CAP.Kafka/KafkaConsumerClient.cs Wyświetl plik

@@ -24,7 +24,7 @@ namespace DotNetCore.CAP.Kafka

public event EventHandler<MessageContext> OnMessageReceived;

public event EventHandler<string> OnError;
public event EventHandler<LogMessageEventArgs> OnLog;

public void Subscribe(IEnumerable<string> topics)
{
@@ -34,7 +34,6 @@ namespace DotNetCore.CAP.Kafka
if (_consumerClient == null)
InitKafkaClient();

//_consumerClient.Assign(topics.Select(x=> new TopicPartition(x, 0)));
_consumerClient.Subscribe(topics);
}

@@ -76,12 +75,17 @@ namespace DotNetCore.CAP.Kafka
_consumerClient.OnError += ConsumerClient_OnError;
}


private void ConsumerClient_OnConsumeError(object sender, Message e)
{
var message = e.Deserialize<Null, string>(null, StringDeserializer);

OnError?.Invoke(sender, $"An error occurred during consume the message; Topic:'{e.Topic}'," +
$"Message:'{message.Value}', Reason:'{e.Error}'.");
var logArgs = new LogMessageEventArgs
{
LogType = MqLogType.ConsumeError,
Reason = $"An error occurred during consume the message; Topic:'{e.Topic}'," +
$"Message:'{message.Value}', Reason:'{e.Error}'."
};
OnLog?.Invoke(sender, logArgs);
}

private void ConsumerClient_OnMessage(object sender, Message<Null, string> e)
@@ -98,7 +102,12 @@ namespace DotNetCore.CAP.Kafka

private void ConsumerClient_OnError(object sender, Error e)
{
OnError?.Invoke(sender, e.ToString());
var logArgs = new LogMessageEventArgs
{
LogType = MqLogType.ServerConnError,
Reason = e.ToString()
};
OnLog?.Invoke(sender, logArgs);
}

#endregion private methods


+ 24
- 0
src/DotNetCore.CAP/MqLogType.cs Wyświetl plik

@@ -0,0 +1,24 @@
using System;

namespace DotNetCore.CAP
{
public enum MqLogType
{
//RabbitMQ
ConsumerCancelled,
ConsumerRegistered,
ConsumerUnregistered,
ConsumerShutdown,

//Kafka
ConsumeError,
ServerConnError
}

public class LogMessageEventArgs : EventArgs
{
public string Reason { get; set; }

public MqLogType LogType { get; set; }
}
}

Ładowanie…
Anuluj
Zapisz