From 65728367161787a7962e6393f0d5292338424b64 Mon Sep 17 00:00:00 2001 From: taywon Date: Sun, 19 May 2024 19:23:32 +0200 Subject: [PATCH] added debugging str --- Salmon.Core/Transmitter.cs | 10 ++++++---- Salmon.Service/RunEnv/config.json | 2 +- Salmon.Web/TripletJsonConverter.cs | 4 +++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Salmon.Core/Transmitter.cs b/Salmon.Core/Transmitter.cs index 266f46d..bb5597c 100644 --- a/Salmon.Core/Transmitter.cs +++ b/Salmon.Core/Transmitter.cs @@ -16,7 +16,11 @@ public class Transmitter foreach (Element element in elements) triplets.AddRange(Translator.Encode(element)); - await Client.PostAsJsonAsync(uri, triplets, cancellationToken: tk); + var result = await Client.PostAsJsonAsync(uri, triplets, cancellationToken: tk); + + if (!result.IsSuccessStatusCode) + throw new Exception($"SendAsync call return code {result.StatusCode} when call {uri}."); + } public async Task SendAsync(Uri uri, IEnumerable events, CancellationToken tk = default) @@ -31,9 +35,7 @@ public class Transmitter Uri uri = new Uri(BaseUrl, "Push/Elements"); - var result = await Client.PostAsJsonAsync(uri, elements, tk); - if (!result.IsSuccessStatusCode) - throw new Exception($"SendAsync call return code {result.StatusCode} when call {uri}."); + await SendAsync(uri, elements, tk); } public async Task SendAsync(Element element, CancellationToken tk = default) diff --git a/Salmon.Service/RunEnv/config.json b/Salmon.Service/RunEnv/config.json index 1e2eda3..73c60e3 100644 --- a/Salmon.Service/RunEnv/config.json +++ b/Salmon.Service/RunEnv/config.json @@ -1,5 +1,5 @@ { - "Url":"http://salmon.voie93quarts.fr/api/Push", + "Url":"http://salmon.voie93quarts.fr/api/", "Period":15000, "Watch":[ { diff --git a/Salmon.Web/TripletJsonConverter.cs b/Salmon.Web/TripletJsonConverter.cs index 11fc97c..dcc4f17 100644 --- a/Salmon.Web/TripletJsonConverter.cs +++ b/Salmon.Web/TripletJsonConverter.cs @@ -32,7 +32,7 @@ public class TripletJsonConverter Debug.Assert(reader.TokenType == JsonTokenType.String); ret.predicate = reader.GetString(); } - else if(jsonkey == nameof(Triplet.LastFlush)) + else if(jsonkey.ToLower() == nameof(Triplet.LastFlush).ToLower()) { Debug.Assert(reader.TokenType == JsonTokenType.String); ret.LastFlush = reader.GetDateTime(); @@ -52,6 +52,8 @@ public class TripletJsonConverter else throw new NotImplementedException($"Cannot read Triple.value from token type {reader.TokenType}."); } + else + Console.WriteLine($"Unknown triplet field {jsonkey} with token type {reader.TokenType}."); } return ret;