From 9e0662959587134b189ddd6915e83272634d8c23 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Wed, 19 Jan 2022 22:59:10 +0100 Subject: [PATCH] [1.8.2] Logging better --- CHANGELOG.md | 8 ++++++++ Zway-Bot/Zway-Bot.csproj | 5 +++-- Zway-Bot/config-example/settings.conf | 2 +- Zway-Bot/dpkg/make-deb.sh | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a4ce84..f9ded91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 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 diff --git a/Zway-Bot/Zway-Bot.csproj b/Zway-Bot/Zway-Bot.csproj index 33b7ec5..36394b3 100644 --- a/Zway-Bot/Zway-Bot.csproj +++ b/Zway-Bot/Zway-Bot.csproj @@ -6,17 +6,18 @@ BlubbFish.IoT.Bots.ZwayBot.Program Zway-Bot Program.ZwayBot.Bots.IoT.BlubbFish - 1.8.1 + 1.8.2 de-DE Is a Bot for Zwave Devices BlubbFish BlubbFish - Copyright © BlubbFish 2017 - 18.01.2022 + Copyright © BlubbFish 2017 - 19.01.2022 LICENSE https://git.blubbfish.net/vs_projects/Zway-Bot https://git.blubbfish.net/vs_projects/Zway-Bot.git git + 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 diff --git a/Zway-Bot/config-example/settings.conf b/Zway-Bot/config-example/settings.conf index 5ad87f3..54bd5af 100644 --- a/Zway-Bot/config-example/settings.conf +++ b/Zway-Bot/config-example/settings.conf @@ -5,4 +5,4 @@ pass=pass type=zway [logging] -path=/var/log/zwaybot.log \ No newline at end of file +path=/var/log/zwaybot/debug.log \ No newline at end of file diff --git a/Zway-Bot/dpkg/make-deb.sh b/Zway-Bot/dpkg/make-deb.sh index a2dc152..e09fb07 100644 --- a/Zway-Bot/dpkg/make-deb.sh +++ b/Zway-Bot/dpkg/make-deb.sh @@ -15,9 +15,11 @@ export DESCRIPTION="Zway-Bot manage a Zwave.me installation so that it has more 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" @@ -25,11 +27,12 @@ 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