Skip to content

Commit 70ef824

Browse files
jiridanekkornys
authored andcommitted
Print ttl, creation-time, and absolute-expiry-time the dTests way (#13)
Previously, default ttl (when nothing was set) was printed as uint.MaxValue. This commit changes it to 0 in this situation. Previously, the values of DateTime type (or AMQP's timestamp) were formated weirdly (Ticks == 0 was printed as negative nubmer). This commit prints the Ticks value, which is what other clis do. ab_diff = [{'ttl': [4294967295, 0]}] 'creation-time': -62135596800, 'ttl': 4294967295, 'absolute-expiry-time': -62135596800
1 parent 549ba06 commit 70ef824

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

src/dotNet/ClientLib/Formatter.cs

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ public static void PrintMessageAsDict(Message msg, bool hashContent)
6464
{
6565
Dictionary<string, object> msgDict = new Dictionary<string,object>();
6666
msgDict.Add("durable", msg.Header.Durable);
67-
msgDict.Add("ttl", msg.Header.Ttl);
67+
msgDict.Add("ttl", FormatTTL(msg.Header.Ttl));
6868
msgDict.Add("delivery_count", msg.Header.DeliveryCount);
6969
msgDict.Add("priority", (uint)msg.Header.Priority);
7070
msgDict.Add("first_acquirer", msg.Header.FirstAcquirer);
7171
msgDict.Add("id", msg.Properties.MessageId);
7272
msgDict.Add("reply_to", msg.Properties.ReplyTo);
7373
msgDict.Add("subject", msg.Properties.Subject);
74-
msgDict.Add("creation-time", msg.Properties.CreationTime);
75-
msgDict.Add("absolute-expiry-time", msg.Properties.AbsoluteExpiryTime);
74+
msgDict.Add("creation-time", msg.Properties.CreationTime.Ticks);
75+
msgDict.Add("absolute-expiry-time", msg.Properties.AbsoluteExpiryTime.Ticks);
7676
msgDict.Add("content_encoding", msg.Properties.ContentEncoding);
7777
msgDict.Add("content_type", msg.Properties.ContentType);
7878
msgDict.Add("correlation_id", msg.Properties.CorrelationId);
@@ -95,7 +95,7 @@ public static void PrintMessageAsInterop(Message msg, bool hashContent)
9595
{
9696
Dictionary<string, object> msgDict = new Dictionary<string, object>();
9797
msgDict.Add("durable", msg.Header.Durable);
98-
msgDict.Add("ttl", msg.Header.Ttl);
98+
msgDict.Add("ttl", FormatTTL(msg.Header.Ttl));
9999
msgDict.Add("delivery-count", msg.Header.DeliveryCount);
100100
msgDict.Add("priority", (uint)msg.Header.Priority);
101101
msgDict.Add("first-acquirer", msg.Header.FirstAcquirer);
@@ -104,8 +104,8 @@ public static void PrintMessageAsInterop(Message msg, bool hashContent)
104104
msgDict.Add("address", msg.Properties.To);
105105
msgDict.Add("reply-to", msg.Properties.ReplyTo);
106106
msgDict.Add("subject", msg.Properties.Subject);
107-
msgDict.Add("creation-time", msg.Properties.CreationTime);
108-
msgDict.Add("absolute-expiry-time", msg.Properties.AbsoluteExpiryTime);
107+
msgDict.Add("creation-time", msg.Properties.CreationTime.Ticks);
108+
msgDict.Add("absolute-expiry-time", msg.Properties.AbsoluteExpiryTime.Ticks);
109109
msgDict.Add("content-encoding", msg.Properties.ContentEncoding);
110110
msgDict.Add("content-type", msg.Properties.ContentType);
111111
msgDict.Add("correlation-id", RemoveIDPrefix(msg.Properties.CorrelationId));
@@ -128,7 +128,7 @@ public static void PrintMessageAsJson(Message msg, bool hashContent)
128128
{
129129
Dictionary<string, object> msgDict = new Dictionary<string, object>();
130130
msgDict.Add("durable", msg.Header.Durable);
131-
msgDict.Add("ttl", msg.Header.Ttl);
131+
msgDict.Add("ttl", FormatTTL(msg.Header.Ttl));
132132
msgDict.Add("delivery-count", msg.Header.DeliveryCount);
133133
msgDict.Add("priority", (uint)msg.Header.Priority);
134134
msgDict.Add("first-acquirer", msg.Header.FirstAcquirer);
@@ -137,8 +137,8 @@ public static void PrintMessageAsJson(Message msg, bool hashContent)
137137
msgDict.Add("address", msg.Properties.To);
138138
msgDict.Add("reply-to", msg.Properties.ReplyTo);
139139
msgDict.Add("subject", msg.Properties.Subject);
140-
msgDict.Add("creation-time", msg.Properties.CreationTime);
141-
msgDict.Add("absolute-expiry-time", msg.Properties.AbsoluteExpiryTime);
140+
msgDict.Add("creation-time", msg.Properties.CreationTime.Ticks);
141+
msgDict.Add("absolute-expiry-time", msg.Properties.AbsoluteExpiryTime.Ticks);
142142
msgDict.Add("content-encoding", msg.Properties.ContentEncoding);
143143
msgDict.Add("content-type", msg.Properties.ContentType);
144144
msgDict.Add("correlation-id", RemoveIDPrefix(msg.Properties.CorrelationId));
@@ -459,14 +459,13 @@ public static string FormatPriority(byte inData)
459459
}
460460

461461
/// <summary>
462-
/// Format sec to string ms
462+
/// Format TTL so that no TTL present is printed as a 0
463463
/// </summary>
464-
/// <param name="inData">byte</param>
465-
/// <returns>string in ms</returns>
466-
public static string FormatTTL(byte inData)
464+
/// <param name="inData">uint</param>
465+
/// <returns>ttl in ms</returns>
466+
public static uint FormatTTL(uint inData)
467467
{
468-
double sec_data = inData / 1000;
469-
return sec_data.ToString();
468+
return inData == uint.MaxValue ? 0 : inData;
470469
}
471470

472471
/// <summary>

0 commit comments

Comments
 (0)