FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

93_DbLog: verbose level in addlog changed if reading not found

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16610 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2018-04-13 21:06:38 +00:00
parent efab58241d
commit 7e51f01d20
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # 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 - feature: 59_WUup: added AqPM2.5, AqPM10; fixed documentation
- bugfix: 73_ElectricityCalculator: missing notifydev implemented - bugfix: 73_ElectricityCalculator: missing notifydev implemented
- bugfix: 73_GasCalculator: missing notifydev implemented - bugfix: 73_GasCalculator: missing notifydev implemented

12
fhem/FHEM/93_DbLog.pm
View File

@ -16,6 +16,8 @@
############################################################################################################################################ ############################################################################################################################################
# Versions History done by DS_Starter & DeeSPe: # 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.4 11.04.2018 fix addLog if no valueFn is used
# 3.10.3 10.04.2018 minor fixes in addLog # 3.10.3 10.04.2018 minor fixes in addLog
# 3.10.2 09.04.2018 add qualifier CN=<caller name> to addlog # 3.10.2 09.04.2018 add qualifier CN=<caller name> to addlog
@ -200,7 +202,7 @@ use Time::HiRes qw(gettimeofday tv_interval);
use Encode qw(encode_utf8); use Encode qw(encode_utf8);
no if $] >= 5.017011, warnings => 'experimental::smartmatch'; no if $] >= 5.017011, warnings => 'experimental::smartmatch';
my $DbLogVersion = "3.10.4"; my $DbLogVersion = "3.10.6";
my %columns = ("DEVICE" => 64, my %columns = ("DEVICE" => 64,
"TYPE" => 64, "TYPE" => 64,
@ -3614,10 +3616,11 @@ sub DbLog_AddLog($$$$$) {
Log3 $name, 4, "DbLog $name -> Readings extracted from Regex: @exrds"; Log3 $name, 4, "DbLog $name -> Readings extracted from Regex: @exrds";
if(!@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; next;
} }
no warnings 'uninitialized';
foreach (@exrds) { foreach (@exrds) {
$dev_reading = $_; $dev_reading = $_;
$read_val = $value ne ""?$value:ReadingsVal($dev_name,$dev_reading,""); $read_val = $value ne ""?$value:ReadingsVal($dev_name,$dev_reading,"");
@ -3663,7 +3666,6 @@ sub DbLog_AddLog($$$$$) {
$ut = $UNIT if(defined $UNIT); $ut = $UNIT if(defined $UNIT);
} }
no warnings 'uninitialized';
# Daten auf maximale Länge beschneiden # 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); ($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); 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" 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)); if(!AttrVal($name, "suppressAddLogV3",0));
use warnings;
if($async) { if($async) {
# asynchoner non-blocking Mode # asynchoner non-blocking Mode
@ -3694,6 +3695,7 @@ sub DbLog_AddLog($$$$$) {
push(@row_array, $row); push(@row_array, $row);
} }
} }
use warnings;
} }
if(!$async) { if(!$async) {
if(@row_array) { if(@row_array) {
@ -3701,7 +3703,7 @@ sub DbLog_AddLog($$$$$) {
# return wenn "reopen" mit Ablaufzeit gestartet ist # return wenn "reopen" mit Ablaufzeit gestartet ist
return if($hash->{HELPER}{REOPEN_RUNS}); return if($hash->{HELPER}{REOPEN_RUNS});
my $error = DbLog_Push($hash, 1, @row_array); my $error = DbLog_Push($hash, 1, @row_array);
my $state = $error?$error:(IsDisabled($name))?"disabled":"connected"; my $state = $error?$error:(IsDisabled($name))?"disabled":"connected";
my $evt = ($state eq $hash->{HELPER}{OLDSTATE})?0:1; my $evt = ($state eq $hash->{HELPER}{OLDSTATE})?0:1;
readingsSingleUpdate($hash, "state", $state, $evt); readingsSingleUpdate($hash, "state", $state, $evt);