FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-12 16:46:35 +00:00
Code Issues Releases Wiki Activity

93_DbLog: contrib 5.2.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26783 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2022-12-05 12:55:04 +00:00
parent 36121ef4a3
commit cbedb9329d
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fhem/contrib/DS_Starter/93_DbLog.pm
View File

@ -1363,8 +1363,7 @@ sub DbLog_Log {
}
}
my ($event,$reading,$value,$unit);
my $err;
my ($event,$reading,$value,$unit,$err,$DoIt);
my $memcount = 0;
@ -1481,7 +1480,7 @@ sub DbLog_Log {
# Je nach DBLogSelectionMode muss das vorgegebene Ergebnis der Include-, bzw. Exclude-Pruefung
# entsprechend unterschiedlich vorbelegt sein.
# keine Readings loggen die in DbLogExclude explizit ausgeschlossen sind
my $DoIt = 0;
$DoIt = 0;
$DoIt = 1 if($DbLogSelectionMode =~ m/Exclude/ );
@ -1650,7 +1649,8 @@ sub DbLog_Log {
};
if($async) { # asynchoner non-blocking Mode
readingsSingleUpdate($hash, 'CacheUsage', $memcount, ($ce == 1 ? 1 : 0));
if($memcount) {
readingsSingleUpdate($hash, 'CacheUsage', $memcount, ($ce == 1 ? 1 : 0)) if($DoIt);
if($memcount >= $clim) { # asynchrone Schreibroutine aufrufen wenn Füllstand des Cache erreicht ist
my $lmlr = $hash->{HELPER}{LASTLIMITRUNTIME};
@ -1665,8 +1665,7 @@ sub DbLog_Log {
$hash->{HELPER}{LASTLIMITRUNTIME} = gettimeofday();
}
}
$net = tv_interval($nst); # Notify-Routine Laufzeit ermitteln
}
}
if(!$async) {
@ -1675,8 +1674,6 @@ sub DbLog_Log {
$err = DbLog_execMemCacheSync ($hash);
DbLog_setReadingstate ($hash, $err) if($err);
$net = tv_interval($nst); # Notify-Routine Laufzeit ermitteln
}
else {
if($hash->{HELPER}{SHUTDOWNSEQ}) {
@ -1686,6 +1683,8 @@ sub DbLog_Log {
}
}
$net = tv_interval($nst); # Notify-Routine Laufzeit ermitteln
if($net && AttrVal($name, 'showNotifyTime', 0)) {
readingsSingleUpdate($hash, 'notify_processing_time', sprintf("%.4f",$net), 1);
}
@ -4007,6 +4006,8 @@ sub DbLog_SBP_Read {
delete $hash->{HELPER}{'LONGRUN_PID'};
delete $hash->{HELPER}{LASTLIMITRUNTIME} if(!$msg);
my $ce = AttrVal ($name, 'cacheEvents', 0);
# Log3 ($name, 1, "DbLog $name - Read result of operation: $oper");
# Log3 ($name, 1, "DbLog $name - DbLog_SBP_Read: name: $name, msg: $msg, ot: $ot, rowlback: ".Dumper $rowlback);
@ -4026,15 +4027,17 @@ sub DbLog_SBP_Read {
$memcount = DbLog_addMemCacheRow ($name, $rowlback->{$key}); # Datensatz zum Memory Cache hinzufügen
}
};
readingsSingleUpdate ($hash, 'CacheUsage', $memcount, ($ce == 1 ? 1 : 0));
}
if($asyncmode) {
$memcount = defined $data{DbLog}{$name}{cache}{memcache} ?
scalar(keys %{$data{DbLog}{$name}{cache}{memcache}}) :
0;
#if($asyncmode) {
# $memcount = defined $data{DbLog}{$name}{cache}{memcache} ?
# scalar(keys %{$data{DbLog}{$name}{cache}{memcache}}) :
# 0;
readingsSingleUpdate ($hash, 'CacheUsage', $memcount, 0);
}
# readingsSingleUpdate ($hash, 'CacheUsage', $memcount, 0);
#}
if(AttrVal($name, 'showproctime', 0) && $ot) {
my ($rt,$brt) = split(",", $ot);