From 7af4ef7c4e78024d6d330813a9c860ad70956193 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Tue, 2 Oct 2018 14:53:59 +0000 Subject: [PATCH] Zway-Bot [v1.7.2] Add Logging to some Modules, fixing a bug in overtaker (now it not removes every time all events, so only the latest event are watched) [Utils] Fixing a bug if more than one argument with params --- Moduls/Mqtt.cs | 1 + Moduls/Overtaker.cs | 7 +++++-- Properties/AssemblyInfo.cs | 6 +++--- bin/Release/Bot-Utils.dll | Bin 23040 -> 23040 bytes 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Moduls/Mqtt.cs b/Moduls/Mqtt.cs index 7641f1c..7644868 100644 --- a/Moduls/Mqtt.cs +++ b/Moduls/Mqtt.cs @@ -37,6 +37,7 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls { } protected void Reconnect() { + Console.WriteLine("BlubbFish.Utils.IoT.Bots.Moduls.Mqtt.Reconnect()"); this.Disconnect(); this.Connect(); } diff --git a/Moduls/Overtaker.cs b/Moduls/Overtaker.cs index 4760187..c10db31 100644 --- a/Moduls/Overtaker.cs +++ b/Moduls/Overtaker.cs @@ -13,12 +13,13 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls { #region Overtakerfunctions protected void ParseIni() { + this.RemoveLibraryUpdateHooks(); foreach (KeyValuePair> item in this.config) { if (item.Value.ContainsKey("from")) { String from = item.Value["from"]; String[] source = from.Split(':'); this.events.Add(source[0], item.Value); - this.LibraryUpdateHook(source[0]); + this.AddLibraryUpdateHook(source[0]); } } } @@ -53,7 +54,9 @@ namespace BlubbFish.Utils.IoT.Bots.Moduls { } } - protected abstract void LibraryUpdateHook(String id); + protected abstract void AddLibraryUpdateHook(String id); + + protected abstract void RemoveLibraryUpdateHooks(); protected abstract void SetValueHook(String id, String prop, String value); #endregion diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 0fc2b19..b724b7c 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Bot-Utils")] -[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyCopyright("Copyright © 2018 - 02.10.2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // indem Sie "*" wie unten gezeigt eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.0")] +[assembly: AssemblyVersion("1.0.2")] +[assembly: AssemblyFileVersion("1.0.2")] diff --git a/bin/Release/Bot-Utils.dll b/bin/Release/Bot-Utils.dll index 9c9635f812b16ecb637578ad7ebcb85e447cd1d1..ebf8e504efd8d4296e0db3926a0284a0a12f0dc7 100644 GIT binary patch delta 5108 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 C8Tc6h