[1.8.3] Shutdown working

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## 1.8.3 - 2022-01-20 - Shutdown working
+### New Features
+* Deconstruction makes better Output
+### Bugfixes
+### Changes
+* Bump Bot-Utils to ([v.1.2.5](https://git.blubbfish.net/vs_utils/Bot-Utils/src/tag/v1.2.5))
+* Bunp Utils to ([v1.6.1](https://git.blubbfish.net/vs_utils/Utils/src/tag/v1.6.1))
+* Bump Zway to ([v1.6.1](https://git.blubbfish.net/vs_projects/Zway/src/tag/v1.6.1))
+* Modify buildscript
+
+## 1.8.2 - 2022-01-19 - Logging better
+### New Features
+* Change buildscript, so logrotate is not overwritten by setup every time
+### Bugfixes
+### Changes
+* Change default logpath
+* Modify buildscript
+
+## 1.8.1 - 2022-01-18 - New Default Configs
+### New Features
+* Bump Bot-Utils to ([v1.2.4](https://git.blubbfish.net/vs_utils/Bot-Utils/src/tag/v1.2.4)) and using the possibillity to enable via config if a module is loaded
+### Bugfixes
+* Buildscript not cleansup behind
+### Changes
+* New Sample Configs
+* Codingstyles
+* Add dependency to dotnet-runtime-3.1 (>= 3.1.22) in buildscript
+
 ## 1.8.0 - 2022-01-16 - Running again
 ### New Features
 * Change licence file (LGPL 4)

Zway-Bot/Moduls/CronJob.cs

@@ -1,8 +1,8 @@
 using System;
+
 using BlubbFish.IoT.Zway;
 using BlubbFish.IoT.Zway.Interfaces;
 using BlubbFish.Utils;
-using BlubbFish.Utils.IoT.Bots;
 using BlubbFish.Utils.IoT.Bots.Events;
 using BlubbFish.Utils.IoT.Bots.Moduls;
 

Zway-Bot/Moduls/Overtaker.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
+
 using BlubbFish.IoT.Zway;
 using BlubbFish.IoT.Zway.Events;
 using BlubbFish.IoT.Zway.Interfaces;
 using BlubbFish.Utils;
-using BlubbFish.Utils.IoT.Bots;
 using BlubbFish.Utils.IoT.Bots.Events;
 using BlubbFish.Utils.IoT.Bots.Moduls;
 

Zway-Bot/Moduls/StatusPolling.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+
 using BlubbFish.IoT.Zway;
 using BlubbFish.IoT.Zway.Devices;
 using BlubbFish.IoT.Zway.Interfaces;

Zway-Bot/Program.cs

@@ -34,9 +34,19 @@ namespace BlubbFish.IoT.Bots.ZwayBot {
       this.ModulInterconnect();
       this.ModulEvents();
       this.WaitForShutdown();
+      this.Deconstructor(zw);
+
+      Console.WriteLine("Bye!");
+    }
+
+    private void Deconstructor(ZwayController zw) {
+      Console.WriteLine("BlubbFish.IoT.Bots.ZwayBot.Program.Deconstructor(): Deconstruct ZwayBot.");
+
       this.ModulDispose();
+      Console.WriteLine("BlubbFish.IoT.Bots.ZwayBot.Program.Deconstructor(): ModuleDisposed.");
 
       zw.Dispose();
+      Console.WriteLine("BlubbFish.IoT.Bots.ZwayBot.Program.Deconstructor(): Zway lib Disposed.");
     }
 
     private void ZwayDataUpate(Object sender, Zway.Events.DeviceUpdateEvent e) => Console.WriteLine("-> ZW [" + e.UpdateTime + "]: " + e.Parent.ToString());

Zway-Bot/Zway-Bot.csproj

@@ -6,17 +6,20 @@
     <RootNamespace>BlubbFish.IoT.Bots.ZwayBot.Program</RootNamespace>
     <AssemblyName>Zway-Bot</AssemblyName>
     <PackageId>Program.ZwayBot.Bots.IoT.BlubbFish</PackageId>
-    <Version>1.8.0</Version>
+    <Version>1.8.3</Version>
     <NeutralLanguage>de-DE</NeutralLanguage>
     <Description>Is a Bot for Zwave Devices</Description>
     <Authors>BlubbFish</Authors>
     <Company>BlubbFish</Company>
-    <Copyright>Copyright © BlubbFish 2017 - 16.01.2022</Copyright>
+    <Copyright>Copyright © BlubbFish 2017 - 20.01.2022</Copyright>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageProjectUrl>https://git.blubbfish.net/vs_projects/Zway-Bot</PackageProjectUrl>
     <RepositoryUrl>https://git.blubbfish.net/vs_projects/Zway-Bot.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageReleaseNotes>
+      1.8.3 - 2022-01-20 - Shutdown working
+      1.8.2 - 2022-01-19 - Logging better
+      1.8.1 - 2022-01-18 - New Default Configs
       1.8.0 - 2022-01-16 - Running again
       1.7.3 - 2018-10-29 - Change dependencys
       1.7.2 - 2018-10-02 - Improve

Zway-Bot/config-example/cronjob.conf

@@ -1,10 +1,11 @@
 [modul]
+enabled=true
 config=public
 
-[cold]
-cron=0 23 * * 0-4
-set=7-0-67-2:Level-19;7-0-112-8:Level-2
+; [cold]
+; cron=0 23 * * 0-4
+; set=7-0-67-2:Level-19;7-0-112-8:Level-2
 
-[hot]
-cron=0 16 * * 1-5
-set=7-0-67-1:Level-22;7-0-112-8:Level-1
+; [hot]
+; cron=0 16 * * 1-5
+; set=7-0-67-1:Level-22;7-0-112-8:Level-1

Zway-Bot/config-example/mqtt.conf

@@ -1,4 +1,5 @@
 [modul]
+enabled=false
 config=private
 
 [settings]

Zway-Bot/config-example/overtaker.conf

@@ -1,12 +1,16 @@
-[hot]
-from=7-0-67-1:Level
-to=8-0-67-1:Level;9-0-67-1:Level
+[modul]
+enabled=false
+config=public
 
-[cold]
-from=7-0-67-2:Level
-to=8-0-67-11:Level;9-0-67-11:Level
+; [hot]
+; from=7-0-67-1:Level
+; to=8-0-67-1:Level;9-0-67-1:Level
 
-[mode]
-from=7-0-112-8:Level
-to=8-0-64:Level;9-0-64:Level
-convert=1-1;2-11
+; [cold]
+; from=7-0-67-2:Level
+; to=8-0-67-11:Level;9-0-67-11:Level
+
+; [mode]
+; from=7-0-112-8:Level
+; to=8-0-64:Level;9-0-64:Level
+; convert=1-1;2-11

Zway-Bot/config-example/senml.conf

@@ -1,4 +1,5 @@
 [modul]
+enabled=false
 config=private
 
 [settings]

Zway-Bot/config-example/settings.conf

@@ -5,4 +5,4 @@ pass=pass
 type=zway
 
 [logging]
-path=/var/log/zwaybot.log
+path=/var/log/zwaybot/debug.log

Zway-Bot/config-example/statuspolling.conf

@@ -1,3 +1,7 @@
-[temp]
-cron=30 * * * *
-devices=7-0-49-1,8-0-49-1,9-0-49-1,10-0-49-1,11-0-49-1
+[modul]
+enabled=true
+config=public
+
+; [temp]
+; cron=30 * * * *
+; devices=7-0-49-1,8-0-49-1,9-0-49-1,10-0-49-1,11-0-49-1

Zway-Bot/dpkg/make-deb.sh

@@ -12,11 +12,14 @@ export NAME=zwaybot
 export MAINAINER="BlubbFish <dev@blubbfish.net>"
 export VERSION="$VMAJOR.$VMINOR-$VBUILD"
 export DESCRIPTION="Zway-Bot manage a Zwave.me installation so that it has more features"
+export DEPENDENCIES="dotnet-runtime-3.1 (>= 3.1.22)"
 
 export EXEPATH=Zway-Bot.dll
+export USERNAMEGROUP=zwaybot
 export EXEARGUMENTS=" "
 export RUNNER=/usr/share/dotnet/dotnet
 export COPYEXEC="../bin/Release/netcoreapp3.1/*.dll ../bin/Release/netcoreapp3.1/Zway-Bot.deps.json ../bin/Release/netcoreapp3.1/Zway-Bot.runtimeconfig.json"
+export LOGFILE="/var/log/zwaybot/debug.log"
 
 export COPYCONFIG="../bin/Release/netcoreapp3.1/config-example/*.conf" 
 export CONFIGREPLACEASK="cronjob.conf mqtt.conf names.conf overtaker.conf senml.conf settings.conf statuspolling.conf"
@@ -24,17 +27,18 @@ export CONFIGREPLACEASK="cronjob.conf mqtt.conf names.conf overtaker.conf senml.
 cd ../deb
 export PLATFORM=armhf
 curl -s https://git.blubbfish.net/vs_utils/CI-Scripts/raw/branch/master/deb/control-build.sh | bash
+curl -s https://git.blubbfish.net/vs_utils/CI-Scripts/raw/branch/master/deb/logrotate-build.sh | bash
 curl -s https://git.blubbfish.net/vs_utils/CI-Scripts/raw/branch/master/deb/pre-post-build.sh | bash
 curl -s https://git.blubbfish.net/vs_utils/CI-Scripts/raw/branch/master/deb/service-build.sh | bash
-curl -s https://git.blubbfish.net/vs_utils/CI-Scripts/raw/branch/master/deb/logrotate-build.sh | bash
 curl -s https://git.blubbfish.net/vs_utils/CI-Scripts/raw/branch/master/deb/build-deb.sh | bash
 
+
 export PLATFORM=amd64
 curl -s https://git.blubbfish.net/vs_utils/CI-Scripts/raw/branch/master/deb/control-build.sh | bash
 curl -s https://git.blubbfish.net/vs_utils/CI-Scripts/raw/branch/master/deb/build-deb.sh | bash
 
 cd ..
-# rm deb -rf
+rm deb -rf
 
 cp Builds/* ../../Builds/
 rm Builds -rf