Skip to content

Commit

Permalink
x-sent-timestamp & ForwardAsync (#122)
Browse files Browse the repository at this point in the history
* New header

* Добавлена установка нового заголовка

* Новый Forward Async
  • Loading branch information
DenisKrasakovSDV committed Jan 12, 2022
1 parent 02a38b5 commit 8081806
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 0 deletions.
9 changes: 9 additions & 0 deletions Sources/Contour/Headers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ public class Headers
/// Максимальное количество сообщений в очереди.
/// </summary>
public static readonly string QueueMaxLength = "x-max-length";

public static readonly string SentTimestamp = "x-sent-timestamp";

/// <summary>
/// Коллекция заголовков, значения которых менять запрещено
Expand Down Expand Up @@ -187,6 +189,13 @@ public static string GetString(string key)
return headers;
}

public static void ApplySentTimestamp(IDictionary<string, object> headers)
{
var sent = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();

headers[SentTimestamp] = sent;
}

/// <summary>
/// Применяет к коллекции заголовков установку заголовка <c>Ttl</c>.
/// </summary>
Expand Down
5 changes: 5 additions & 0 deletions Sources/Contour/Receiving/DefaultConsumingContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ public async Task ForwardAsync(string label)
await this.Delivery.Forward(label.ToMessageLabel(), this.Message.Payload);
}

public async Task ForwardAsync<TOut>(string label, TOut payload) where TOut : class
{
await this.Delivery.Forward(label.ToMessageLabel(), payload);
}

/// <summary>
/// Пересылает сообщение, устанавливая указанную метку.
/// </summary>
Expand Down
7 changes: 7 additions & 0 deletions Sources/Contour/Receiving/IConsumingContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ public interface IConsumingContext<T>
/// </summary>
/// <param name="label">Новая метка, с которой пересылается сообщение.</param>
Task ForwardAsync(string label);

/// <summary>
/// Пересылает сообщение, устанавливая указанную метку.
/// </summary>
/// <param name="label">Новая метка, с которой пересылается сообщение.</param>
/// <param name="payload">Новое содержимое сообщения.</param>
Task ForwardAsync<TOut>(string label, TOut payload) where TOut : class;

/// <summary>
/// Пересылает сообщение, устанавливая указанную метку.
Expand Down
4 changes: 4 additions & 0 deletions Sources/Contour/Sending/AbstractSender.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public virtual bool CanRoute(MessageLabel label)
/// <returns>Request processing task.</returns>
public Task<T> Request<T>(object payload, IDictionary<string, object> headers) where T : class
{
Headers.ApplySentTimestamp(headers);
var message = new Message(this.Configuration.Label, headers, payload);

var exchange = new MessageExchange(message, typeof(T));
Expand Down Expand Up @@ -138,6 +139,7 @@ public virtual bool CanRoute(MessageLabel label)
[Obsolete("Необходимо использовать метод Send с указанием метки сообщения.")]
public Task Send(object payload, IDictionary<string, object> headers)
{
Headers.ApplySentTimestamp(headers);
var message = new Message(this.Configuration.Label, headers, payload);

return this.ProcessFilter(message, null);
Expand Down Expand Up @@ -185,6 +187,7 @@ public Task Send(object payload, PublishingOptions options)
/// <returns>Request processing task.</returns>
public Task<T> Request<T>(MessageLabel label, object payload, IDictionary<string, object> headers) where T : class
{
Headers.ApplySentTimestamp(headers);
if (!headers.ContainsKey(Headers.CorrelationId))
{
headers[Headers.CorrelationId] = Guid.NewGuid().ToString("n");
Expand Down Expand Up @@ -215,6 +218,7 @@ public Task Send(object payload, PublishingOptions options)
/// <returns>Задача выполнения отправки сообщения.</returns>
public Task Send(MessageLabel label, object payload, IDictionary<string, object> headers, string connectionKey)
{
Headers.ApplySentTimestamp(headers);
var message = new Message(this.Configuration.Label.Equals(MessageLabel.Any) ? label : this.Configuration.Label, headers, payload);

return this.ProcessFilter(message, connectionKey);
Expand Down

0 comments on commit 8081806

Please sign in to comment.