From 7e51f01d20b54a639672a599732bf9b30636b75d Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Fri, 13 Apr 2018 21:06:38 +0000 Subject: [PATCH] 93_DbLog: verbose level in addlog changed if reading not found git-svn-id: https://svn.fhem.de/fhem/trunk@16610 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/93_DbLog.pm | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 24f346d22..ce52d9c7b 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. + - change: 93_DbLog: verbose level in addlog changed if reading not found - feature: 59_WUup: added AqPM2.5, AqPM10; fixed documentation - bugfix: 73_ElectricityCalculator: missing notifydev implemented - bugfix: 73_GasCalculator: missing notifydev implemented diff --git a/fhem/FHEM/93_DbLog.pm b/fhem/FHEM/93_DbLog.pm index cc833de18..f3bd007f7 100644 --- a/fhem/FHEM/93_DbLog.pm +++ b/fhem/FHEM/93_DbLog.pm @@ -16,6 +16,8 @@ ############################################################################################################################################ # Versions History done by DS_Starter & DeeSPe: # +# 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 # 3.10.3 10.04.2018 minor fixes in addLog # 3.10.2 09.04.2018 add qualifier CN= to addlog @@ -200,7 +202,7 @@ use Time::HiRes qw(gettimeofday tv_interval); use Encode qw(encode_utf8); no if $] >= 5.017011, warnings => 'experimental::smartmatch'; -my $DbLogVersion = "3.10.4"; +my $DbLogVersion = "3.10.6"; my %columns = ("DEVICE" => 64, "TYPE" => 64, @@ -3614,10 +3616,11 @@ sub DbLog_AddLog($$$$$) { Log3 $name, 4, "DbLog $name -> Readings extracted from Regex: @exrds"; if(!@exrds) { - Log3 $name, 4, "DbLog $name -> no Reading of device '$dev_name' selected from '$rdspec' used by addLog !"; + Log3 $name, 2, "DbLog $name -> no Reading '$rdspec' of device '$dev_name' found by addLog !"; next; } + no warnings 'uninitialized'; foreach (@exrds) { $dev_reading = $_; $read_val = $value ne ""?$value:ReadingsVal($dev_name,$dev_reading,""); @@ -3663,7 +3666,6 @@ sub DbLog_AddLog($$$$$) { $ut = $UNIT if(defined $UNIT); } - no warnings 'uninitialized'; # Daten auf maximale Länge beschneiden ($dev_name,$dev_type,$event,$dev_reading,$read_val,$ut) = DbLog_cutCol($hash,$dev_name,$dev_type,$event,$dev_reading,$read_val,$ut); @@ -3675,7 +3677,6 @@ sub DbLog_AddLog($$$$$) { my $row = ($ts."|".$dev_name."|".$dev_type."|".$event."|".$dev_reading."|".$read_val."|".$ut); Log3 $hash->{NAME}, 3, "DbLog $name -> addLog created - TS: $ts, Device: $dev_name, Type: $dev_type, Event: $event, Reading: $dev_reading, Value: $read_val, Unit: $ut" if(!AttrVal($name, "suppressAddLogV3",0)); - use warnings; if($async) { # asynchoner non-blocking Mode @@ -3694,6 +3695,7 @@ sub DbLog_AddLog($$$$$) { push(@row_array, $row); } } + use warnings; } if(!$async) { if(@row_array) { @@ -3701,7 +3703,7 @@ sub DbLog_AddLog($$$$$) { # return wenn "reopen" mit Ablaufzeit gestartet ist return if($hash->{HELPER}{REOPEN_RUNS}); my $error = DbLog_Push($hash, 1, @row_array); - + my $state = $error?$error:(IsDisabled($name))?"disabled":"connected"; my $evt = ($state eq $hash->{HELPER}{OLDSTATE})?0:1; readingsSingleUpdate($hash, "state", $state, $evt);