From 3ca5768d6eac0dabbb19df6c0481a15cd11c6062 Mon Sep 17 00:00:00 2001 From: taywon Date: Sun, 19 May 2024 18:25:10 +0200 Subject: [PATCH] various changes and corrections for sending data --- Salmon.Core/Transmitter.cs | 4 +++- Salmon.Service/Program.cs | 4 +++- Salmon.Service/RunEnv/config.json | 2 +- Salmon.Web/Controllers/MainController.cs | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Salmon.Core/Transmitter.cs b/Salmon.Core/Transmitter.cs index 2b0900b..266f46d 100644 --- a/Salmon.Core/Transmitter.cs +++ b/Salmon.Core/Transmitter.cs @@ -31,7 +31,9 @@ public class Transmitter Uri uri = new Uri(BaseUrl, "Push/Elements"); - await Client.PostAsJsonAsync(uri, elements, tk); + var result = await Client.PostAsJsonAsync(uri, elements, tk); + if (!result.IsSuccessStatusCode) + throw new Exception($"SendAsync call return code {result.StatusCode} when call {uri}."); } public async Task SendAsync(Element element, CancellationToken tk = default) diff --git a/Salmon.Service/Program.cs b/Salmon.Service/Program.cs index bd46d9a..0b1ee74 100644 --- a/Salmon.Service/Program.cs +++ b/Salmon.Service/Program.cs @@ -119,6 +119,8 @@ if(uri == null) // Initialisation Transmitter transmitter = new(); +transmitter.BaseUrl = uri; + FileSystemWatcher configWatcher; Console.WriteLine($"Salmon.Service started at {DateTime.Now}."); if(configpath != null && watch_config == true) @@ -168,7 +170,7 @@ while ( true ) try { - await transmitter.SendAsync(uri, tosend); + await transmitter.SendAsync(tosend); } catch(HttpRequestException e) { diff --git a/Salmon.Service/RunEnv/config.json b/Salmon.Service/RunEnv/config.json index 999550c..1e2eda3 100644 --- a/Salmon.Service/RunEnv/config.json +++ b/Salmon.Service/RunEnv/config.json @@ -1,5 +1,5 @@ { - "Url":"http://localhost:5009/api/Push", + "Url":"http://salmon.voie93quarts.fr/api/Push", "Period":15000, "Watch":[ { diff --git a/Salmon.Web/Controllers/MainController.cs b/Salmon.Web/Controllers/MainController.cs index 587a466..287a347 100644 --- a/Salmon.Web/Controllers/MainController.cs +++ b/Salmon.Web/Controllers/MainController.cs @@ -33,7 +33,7 @@ namespace Salmon.Web.Controllers return els; } - [HttpPost("Push")] + [HttpPost("Push/Elements")] public void Post([FromBody] IEnumerable triplets) { Instance.Set(triplets);