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

93_DbLog: contrib 4.11.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23859 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2021-02-28 20:27:25 +00:00
parent e951a337e6
commit 2fa7203854
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -604,7 +604,8 @@ sub DbLog_Set {
push @logs,$file; push @logs,$file;
} }
closedir(DIR); closedir(DIR);
my $cj = join(",",reverse(sort @logs)) if (@logs); my $cj = "";
$cj = join(",",reverse(sort @logs)) if (@logs);
if (@logs) { if (@logs) {
$usage .= "importCachefile:".$cj." "; $usage .= "importCachefile:".$cj." ";
@ -5736,9 +5737,11 @@ sub DbLog_reduceLogNbl_finished {
my $name = $a[0]; my $name = $a[0];
my $hash = $defs{$name}; my $hash = $defs{$name};
my $ret = decode_base64($a[1]); my $ret = decode_base64($a[1]);
my $err = decode_base64($a[2]) if ($a[2]); my $err;
$err = decode_base64($a[2]) if ($a[2]);
readingsSingleUpdate($hash,"reduceLogState", $err // $ret, 1);
readingsSingleUpdate($hash,"reduceLogState",$err?$err:$ret,1);
delete $hash->{HELPER}{REDUCELOG_PID}; delete $hash->{HELPER}{REDUCELOG_PID};
return; return;
@ -5783,14 +5786,15 @@ return "$name|$cc|$hc|0|$rt";
# DBLog - count non-blocking Rückkehrfunktion # DBLog - count non-blocking Rückkehrfunktion
######################################################################################### #########################################################################################
sub DbLog_countNbl_finished { sub DbLog_countNbl_finished {
my ($string) = @_; my $string = shift;
my @a = split("\\|",$string); my @a = split("\\|",$string);
my $name = $a[0]; my $name = $a[0];
my $hash = $defs{$name}; my $hash = $defs{$name};
my $cc = $a[1]; my $cc = $a[1];
my $hc = $a[2]; my $hc = $a[2];
my $err = decode_base64($a[3]) if ($a[3]); my ($err,$bt);
my $bt = $a[4] if($a[4]); $err = decode_base64($a[3]) if($a[3]);
$bt = $a[4] if($a[4]);
DbLog_setReadingstate ($hash, $err) if($err); DbLog_setReadingstate ($hash, $err) if($err);
readingsSingleUpdate ($hash,"countHistory",$hc,1) if ($hc); readingsSingleUpdate ($hash,"countHistory",$hc,1) if ($hc);
@ -5798,11 +5802,12 @@ sub DbLog_countNbl_finished {
if(AttrVal($name, "showproctime", undef) && $bt) { if(AttrVal($name, "showproctime", undef) && $bt) {
my ($rt,$brt) = split(",", $bt); my ($rt,$brt) = split(",", $bt);
readingsBeginUpdate($hash); readingsBeginUpdate ($hash);
readingsBulkUpdate($hash, "background_processing_time", sprintf("%.4f",$brt)); readingsBulkUpdate ($hash, "background_processing_time", sprintf("%.4f",$brt));
readingsBulkUpdate($hash, "sql_processing_time", sprintf("%.4f",$rt)); readingsBulkUpdate ($hash, "sql_processing_time", sprintf("%.4f",$rt) );
readingsEndUpdate($hash, 1); readingsEndUpdate ($hash, 1);
} }
delete $hash->{HELPER}{COUNT_PID}; delete $hash->{HELPER}{COUNT_PID};
return; return;
@ -5888,11 +5893,9 @@ sub DbLog_deldaysNbl {
$dbh->disconnect; $dbh->disconnect;
} }
# SQL-Laufzeit ermitteln $rt = tv_interval($st); # SQL-Laufzeit ermitteln
$rt = tv_interval($st);
# Background-Laufzeit ermitteln $brt = tv_interval($bst); # Background-Laufzeit ermitteln
$brt = tv_interval($bst);
$rt = $rt.",".$brt; $rt = $rt.",".$brt;
Log3 ($name, 5, "DbLog $name -> DbLog_deldaysNbl finished"); Log3 ($name, 5, "DbLog $name -> DbLog_deldaysNbl finished");
@ -5903,13 +5906,14 @@ return "$name|$rows|$rt|0";
# DBLog - deleteOldDays non-blocking Rückkehrfunktion # DBLog - deleteOldDays non-blocking Rückkehrfunktion
######################################################################################### #########################################################################################
sub DbLog_deldaysNbl_done { sub DbLog_deldaysNbl_done {
my ($string) = @_; my $string = shift;
my @a = split("\\|",$string); my @a = split("\\|",$string);
my $name = $a[0]; my $name = $a[0];
my $hash = $defs{$name}; my $hash = $defs{$name};
my $rows = $a[1]; my $rows = $a[1];
my $bt = $a[2] if($a[2]); my($bt,$err);
my $err = decode_base64($a[3]) if ($a[3]); $bt = $a[2] if ($a[2]);
$err = decode_base64($a[3]) if ($a[3]);
Log3 ($name, 5, "DbLog $name -> Start DbLog_deldaysNbl_done"); Log3 ($name, 5, "DbLog $name -> Start DbLog_deldaysNbl_done");