Compare commits

..

No commits in common. "master" and "v1.8.1" have entirely different histories.

5 changed files with 9 additions and 59 deletions

View File

@ -1,36 +1,5 @@
# Changelog # Changelog
## 1.8.4 - 2022-01-30 - Logging now more better
### New Features
* Default settings.conf have now debug=false
* ZwayDataUpdate now uses DebugLogging flag
### Bugfixes
* Fixing bug in logrotate-script
### Changes
* ProgrammLogger SetPath removed cause its done by Bot-Utils
* IniReader SetSearchPath removed, cause its done by Bot-Utils
*
* Bump Bot-Utils to ([v.1.2.6](https://git.blubbfish.net/vs_utils/Bot-Utils/src/tag/v1.2.6))
* Bump Utils to ([v.1.6.2](https://git.blubbfish.net/vs_utils/Utils/src/tag/v1.2.6))
## 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 ## 1.8.1 - 2022-01-18 - New Default Configs
### New Features ### 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 * 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

View File

@ -10,9 +10,10 @@ namespace BlubbFish.IoT.Bots.ZwayBot {
class Program : Bot<ZwayController> { class Program : Bot<ZwayController> {
static void Main(String[] args) => new Program(args); static void Main(String[] args) => new Program(args);
public Program(String[] args) : base(args, true, "zwaybot") { public Program(String[] _) {
Console.WriteLine("BlubbFish.IoT.Bots.ZwayBot.Program.Constructor()"); Console.WriteLine("BlubbFish.IoT.Bots.ZwayBot.Program.Constructor()");
InIReader.SetSearchPath(new List<String>() { "/etc/zwaybot", Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\zwaybot" });
Dictionary<String, ReadOnlyDictionary<String, String>> names = new Dictionary<String, ReadOnlyDictionary<String, String>>(); Dictionary<String, ReadOnlyDictionary<String, String>> names = new Dictionary<String, ReadOnlyDictionary<String, String>>();
if(InIReader.ConfigExist("names")) { if(InIReader.ConfigExist("names")) {
foreach(String item in InIReader.GetInstance("names").GetSections(false)) { foreach(String item in InIReader.GetInstance("names").GetSections(false)) {
@ -24,6 +25,8 @@ namespace BlubbFish.IoT.Bots.ZwayBot {
return; return;
} }
this.logger.SetPath(InIReader.GetInstance("settings").GetValue("logging", "path"));
ZwayController zw = new ZwayController(InIReader.GetInstance("settings").GetSection("zway"), names, false); ZwayController zw = new ZwayController(InIReader.GetInstance("settings").GetSection("zway"), names, false);
zw.Recieved += this.ZwayDataUpate; zw.Recieved += this.ZwayDataUpate;
@ -31,26 +34,11 @@ namespace BlubbFish.IoT.Bots.ZwayBot {
this.ModulInterconnect(); this.ModulInterconnect();
this.ModulEvents(); this.ModulEvents();
this.WaitForShutdown(); this.WaitForShutdown();
this.Deconstructor(zw);
Console.WriteLine("Bye!");
this.Dispose();
}
private void Deconstructor(ZwayController zw) {
Console.WriteLine("BlubbFish.IoT.Bots.ZwayBot.Program.Deconstructor(): Deconstruct ZwayBot.");
this.ModulDispose(); this.ModulDispose();
Console.WriteLine("BlubbFish.IoT.Bots.ZwayBot.Program.Deconstructor(): ModuleDisposed.");
zw.Dispose(); zw.Dispose();
Console.WriteLine("BlubbFish.IoT.Bots.ZwayBot.Program.Deconstructor(): Zway lib Disposed.");
} }
private void ZwayDataUpate(Object sender, Zway.Events.DeviceUpdateEvent e) { private void ZwayDataUpate(Object sender, Zway.Events.DeviceUpdateEvent e) => Console.WriteLine("-> ZW [" + e.UpdateTime + "]: " + e.Parent.ToString());
if(this.DebugLogging) {
Console.WriteLine("-> ZW [" + e.UpdateTime + "]: " + e.Parent.ToString());
}
}
} }
} }

View File

@ -6,20 +6,17 @@
<RootNamespace>BlubbFish.IoT.Bots.ZwayBot.Program</RootNamespace> <RootNamespace>BlubbFish.IoT.Bots.ZwayBot.Program</RootNamespace>
<AssemblyName>Zway-Bot</AssemblyName> <AssemblyName>Zway-Bot</AssemblyName>
<PackageId>Program.ZwayBot.Bots.IoT.BlubbFish</PackageId> <PackageId>Program.ZwayBot.Bots.IoT.BlubbFish</PackageId>
<Version>1.8.4</Version> <Version>1.8.1</Version>
<NeutralLanguage>de-DE</NeutralLanguage> <NeutralLanguage>de-DE</NeutralLanguage>
<Description>Is a Bot for Zwave Devices</Description> <Description>Is a Bot for Zwave Devices</Description>
<Authors>BlubbFish</Authors> <Authors>BlubbFish</Authors>
<Company>BlubbFish</Company> <Company>BlubbFish</Company>
<Copyright>Copyright © BlubbFish 2017 - 30.01.2022</Copyright> <Copyright>Copyright © BlubbFish 2017 - 18.01.2022</Copyright>
<PackageLicenseFile>LICENSE</PackageLicenseFile> <PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://git.blubbfish.net/vs_projects/Zway-Bot</PackageProjectUrl> <PackageProjectUrl>https://git.blubbfish.net/vs_projects/Zway-Bot</PackageProjectUrl>
<RepositoryUrl>https://git.blubbfish.net/vs_projects/Zway-Bot.git</RepositoryUrl> <RepositoryUrl>https://git.blubbfish.net/vs_projects/Zway-Bot.git</RepositoryUrl>
<RepositoryType>git</RepositoryType> <RepositoryType>git</RepositoryType>
<PackageReleaseNotes> <PackageReleaseNotes>
1.8.4 - 2022-01-30 - Logging now more better
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.1 - 2022-01-18 - New Default Configs
1.8.0 - 2022-01-16 - Running again 1.8.0 - 2022-01-16 - Running again
1.7.3 - 2018-10-29 - Change dependencys 1.7.3 - 2018-10-29 - Change dependencys

View File

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

View File

@ -15,11 +15,9 @@ export DESCRIPTION="Zway-Bot manage a Zwave.me installation so that it has more
export DEPENDENCIES="dotnet-runtime-3.1 (>= 3.1.22)" export DEPENDENCIES="dotnet-runtime-3.1 (>= 3.1.22)"
export EXEPATH=Zway-Bot.dll export EXEPATH=Zway-Bot.dll
export USERNAMEGROUP=zwaybot
export EXEARGUMENTS=" " export EXEARGUMENTS=" "
export RUNNER=/usr/share/dotnet/dotnet 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 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 COPYCONFIG="../bin/Release/netcoreapp3.1/config-example/*.conf"
export CONFIGREPLACEASK="cronjob.conf mqtt.conf names.conf overtaker.conf senml.conf settings.conf statuspolling.conf" export CONFIGREPLACEASK="cronjob.conf mqtt.conf names.conf overtaker.conf senml.conf settings.conf statuspolling.conf"
@ -27,12 +25,11 @@ export CONFIGREPLACEASK="cronjob.conf mqtt.conf names.conf overtaker.conf senml.
cd ../deb cd ../deb
export PLATFORM=armhf 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/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/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/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 curl -s https://git.blubbfish.net/vs_utils/CI-Scripts/raw/branch/master/deb/build-deb.sh | bash
export PLATFORM=amd64 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/control-build.sh | bash
curl -s https://git.blubbfish.net/vs_utils/CI-Scripts/raw/branch/master/deb/build-deb.sh | bash curl -s https://git.blubbfish.net/vs_utils/CI-Scripts/raw/branch/master/deb/build-deb.sh | bash