Skip to content

Commit 97a1621

Browse files
committed
fix convertion from datetime to timestamps requires utc
1 parent 93d4bc7 commit 97a1621

File tree

7 files changed

+35
-8
lines changed

7 files changed

+35
-8
lines changed

Analogy.LogServer.Clients/AnalogyMessageConsumer.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ public AnalogyMessageConsumer(string address)
5454
};
5555
yield return msg;
5656
if (token.IsCancellationRequested)
57+
{
5758
yield break;
58-
59+
}
5960
}
6061
}
6162
public Task Stop()

Analogy.LogServer.Clients/AnalogyMessageProducer.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ public AnalogyMessageProducer(string address, ILogger logger)
4949
public async Task Log(string text, string source, AnalogyLogLevel level, string category = "",
5050
string machineName = null, string userName = null, string processName = null, int processId = 0, int threadId = 0, Dictionary<string, string> additionalInformation = null, [CallerMemberName] string memberName = "", [CallerLineNumber] int lineNumber = 0, [CallerFilePath] string filePath = "")
5151
{
52-
if (!connected) return;
52+
if (!connected)
53+
{
54+
return;
55+
}
56+
5357
var m = new AnalogyGRPCLogMessage()
5458
{
5559
Text = text,
@@ -69,10 +73,12 @@ public async Task Log(string text, string source, AnalogyLogLevel level, string
6973
User = userName ?? Environment.UserName,
7074
};
7175
if (additionalInformation != null)
76+
{
7277
foreach (KeyValuePair<string, string> keyValuePair in additionalInformation)
7378
{
7479
m.AdditionalInformation.Add(keyValuePair.Key, keyValuePair.Value);
7580
}
81+
}
7682

7783
try
7884
{

Analogy.LogServer.Tests/TestForm.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ public TestForm()
1818

1919
private async void btnProducer_Click(object sender, EventArgs e)
2020
{
21-
if (producing) return;
21+
if (producing)
22+
{
23+
return;
24+
}
25+
2226
producing = true;
2327
btnProducer.Enabled = false;
2428
var p = new AnalogyMessageProducer($"http://{txtIP.Text}:6000", null);
@@ -36,7 +40,11 @@ private async void btnProducer_Click(object sender, EventArgs e)
3640

3741
private async void btnConsumer_Click_1(object sender, EventArgs e)
3842
{
39-
if (consuming) return;
43+
if (consuming)
44+
{
45+
return;
46+
}
47+
4048
consuming = true;
4149
btnConsumer.Enabled = false;
4250

Analogy.LogServer/Analogy.LogServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1818
<IncludeSymbols>true</IncludeSymbols>
1919
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
20-
<Version>0.4.0</Version>
20+
<Version>0.4.1</Version>
2121
<Copyright>Lior Banai @ 2020</Copyright>
2222
</PropertyGroup>
2323
<ItemGroup>

Analogy.LogServer/GRPCLogConsumer.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ public void RemoveGrpcConsumer(IServerStreamWriter<AnalogyGRPCLogMessage> respon
4444
_sync.EnterWriteLock();
4545
var exist = clients.Exists(c => c.stream == responseStream);
4646
if (exist)
47+
{
4748
clients.RemoveAll(c => c.stream == responseStream);
48-
49+
}
4950
}
5051
finally
5152
{
@@ -63,7 +64,11 @@ public async Task ConsumeLog(AnalogyGRPCLogMessage msg)
6364
for (int i = 0; i < clients.Count; i++)
6465
{
6566
var (stream, active) = clients[i];
66-
if (!active) continue;
67+
if (!active)
68+
{
69+
continue;
70+
}
71+
6772
try
6873
{
6974
await _semaphoreSlim.WaitAsync();

Analogy.LogServer/MessageHistoryContainer.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void CleanMessages(int deleteOlderHours)
4343
try
4444
{
4545
_sync.EnterWriteLock();
46-
_OldMessages.RemoveAll(m => m.Date <= Timestamp.FromDateTime(DateTime.Now.AddHours(-deleteOlderHours)));
46+
_OldMessages.RemoveAll(m => m.Date <= Timestamp.FromDateTime(DateTime.Now.AddHours(-deleteOlderHours).ToUniversalTime()));
4747
}
4848
finally
4949
{
@@ -58,7 +58,9 @@ public void CleanMessagesByHalf()
5858
{
5959
_sync.EnterWriteLock();
6060
if (_OldMessages.Any())
61+
{
6162
_OldMessages.RemoveRange(0, _OldMessages.Count / 2);
63+
}
6264
}
6365
finally
6466
{

Analogy.LogServer/Services/GreeterService.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ await responseStream.WriteAsync(new AnalogyGRPCLogMessage
6565
});
6666
var oldMessages = MessageHistoryContainer.GetOldMessages();
6767
if (oldMessages.Any())
68+
{
6869
await responseStream.WriteAllAsync(oldMessages);
70+
}
6971

7072
try
7173
{
@@ -90,7 +92,10 @@ private async Task HandleClientActions(IAsyncStreamReader<AnalogyGRPCLogMessage>
9092
message.Date = Timestamp.FromDateTime(DateTime.UtcNow);
9193
}
9294
if (string.IsNullOrEmpty(message.Id))
95+
{
9396
message.Id = Guid.NewGuid().ToString();
97+
}
98+
9499
MessageContainer.AddMessage(message);
95100
}
96101
catch (Exception e)

0 commit comments

Comments
 (0)