diff --git a/franz.tests/UnitTest1.cs b/franz.tests/UnitTest1.cs index e8c95d5..3d20ed1 100644 --- a/franz.tests/UnitTest1.cs +++ b/franz.tests/UnitTest1.cs @@ -19,7 +19,7 @@ namespace franz.tests } [Test] - public void reportsToSoundoff() + public async Task reportsToSoundoff() { var f1Reported = false; var f2Reported = false; @@ -42,6 +42,7 @@ namespace franz.tests }); f1.StartListening(); f2.StartListening(); + await Task.Delay(2000); f1.ProduceMessage(new silver_messages.global.sound_off()); Task.WaitAny( Task.Run(async () => { @@ -53,7 +54,7 @@ namespace franz.tests //TestContext.Out.WriteLine("done, ready, green"); }), Task.Run(async () => { - await Task.Delay(10000); + await Task.Delay(120000); TestContext.Out.WriteLine("time up"); Assert.Fail(); }) diff --git a/franz/Telefranz.cs b/franz/Telefranz.cs index 839bd09..f2edd67 100644 --- a/franz/Telefranz.cs +++ b/franz/Telefranz.cs @@ -123,36 +123,24 @@ namespace franz StopListening(); listenTask = Task.Run(() => { - try + shouldListen = true; + while (shouldListen) { - shouldListen = true; - while (shouldListen) + var cr = consumer.Consume(); + if (cr != null) { - var cr = consumer.Consume(125); - if (cr != null) + var typeHaver = JsonConvert.DeserializeAnonymousType(cr.Message.Value, new { type = "" }); + var messageType = handlers.Keys.FirstOrDefault(hkey => hkey.ToString() == typeHaver.type && handlers[hkey].Count > 0); + if (messageType != null) { - var typeHaver = JsonConvert.DeserializeAnonymousType(cr.Message.Value, new { type = "" }); - var messageType = handlers.Keys.FirstOrDefault(hkey => hkey.ToString() == typeHaver.type && handlers[hkey].Count > 0); - if (messageType != null) + var message = JsonConvert.DeserializeObject(cr.Message.Value, messageType); + foreach (var handling in handlers[messageType]) { - var message = JsonConvert.DeserializeObject(cr.Message.Value, messageType); - foreach (var handling in handlers[messageType]) - { - handling(message as silver_messages.message); - } + handling(message as silver_messages.message); } } } } - catch (System.OperationCanceledException) - { - Console.WriteLine("cancelled"); - } - catch (Confluent.Kafka.ConsumeException e) - { - Console.Error.WriteLine(JsonConvert.SerializeObject(e)); - throw; - } }); } public void StopListening() diff --git a/franz/franz.csproj b/franz/franz.csproj index eaffe95..bc37bbe 100644 --- a/franz/franz.csproj +++ b/franz/franz.csproj @@ -2,7 +2,7 @@ net5.0 - franz + silvermeddlists.franz 0.0.1 adam Silver Meddlists