From 7c992f1e23bd1199ca84aedf68bf88f55261b954 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Mon, 16 Apr 2018 22:00:02 +0000 Subject: [PATCH] 93_DbLog: 3.10.7, create addLog-event if reading was not found git-svn-id: https://svn.fhem.de/fhem/trunk@16626 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/93_DbLog.pm | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 7b03c652a..df276aac5 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 93_DbLog: 3.10.7, create addLog-event if reading was not found - bugfix: 73_GardenaSmartBridge: add error trigger for notify sub - feature: 98_SVG.pm: horizontalLine* added (Forum #86800) - change: 93_DbLog: verbose level in addlog changed if reading not found diff --git a/fhem/FHEM/93_DbLog.pm b/fhem/FHEM/93_DbLog.pm index f3bd007f7..aaa096259 100644 --- a/fhem/FHEM/93_DbLog.pm +++ b/fhem/FHEM/93_DbLog.pm @@ -16,6 +16,7 @@ ############################################################################################################################################ # Versions History done by DS_Starter & DeeSPe: # +# 3.10.7 16.04.2018 fix generate addLog-event if device or reading was not found by addLog # 3.10.6 13.04.2018 verbose level in addlog changed if reading not found # 3.10.5 12.04.2018 fix warnings # 3.10.4 11.04.2018 fix addLog if no valueFn is used @@ -202,7 +203,7 @@ use Time::HiRes qw(gettimeofday tv_interval); use Encode qw(encode_utf8); no if $] >= 5.017011, warnings => 'experimental::smartmatch'; -my $DbLogVersion = "3.10.6"; +my $DbLogVersion = "3.10.7"; my %columns = ("DEVICE" => 64, "TYPE" => 64, @@ -503,7 +504,7 @@ sub DbLog_Set($@) { return $usage if(int(@a) < 2); my $dbh = $hash->{DBHP}; - my $db = (split(/;|=/, $hash->{dbconn}))[1]; + my $db = (split(/;|=/, $hash->{dbconn}))[1]; my $ret; if ($a[1] eq 'reduceLog') { @@ -563,6 +564,8 @@ sub DbLog_Set($@) { map(s/CN=$cn//g, @a); } DbLog_AddLog($hash,$a[2],$a[3],$nce,$cn); + my $skip_trigger = 1; # kein Event erzeugen falls addLog device/reading not found aber Abarbeitung erfolgreich + return undef,$skip_trigger; } elsif ($a[1] eq 'reopen') { if ($dbh) { @@ -859,7 +862,6 @@ sub DbLog_Set($@) { else { $ret = $usage; } return $ret; - } ###############################################################################################