FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 01:14:19 +00:00
Code Issues Releases Wiki Activity

93_DbLog: write cachefile while Server shutdown if database isn't available, Forum: #133599

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@27617 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2023-05-25 19:56:44 +00:00
parent 49d4bd5cb3
commit d10b7542f9
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# 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.
- feature: 93_DbLog: write cachefile while Server shutdown if database isn't
available, Forum: #133599
- change: 00_KNXIO: multiple changes, see Forum #127792 - change: 00_KNXIO: multiple changes, see Forum #127792
- change: 10_KNX: multiple changes, see Forum #122582 - change: 10_KNX: multiple changes, see Forum #122582
- change: 74_AutomowerConnect: Common.pm, automowerconnect.js - change: 74_AutomowerConnect: Common.pm, automowerconnect.js

22
fhem/FHEM/93_DbLog.pm
View File

@ -39,9 +39,11 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch';
# Version History intern by DS_Starter: # Version History intern by DS_Starter:
my %DbLog_vNotesIntern = ( my %DbLog_vNotesIntern = (
"5.9.0" => "16.05.2023 Server shutdown -> write cachefile if database connect can't be done during delayed shutdown ".
"Forum: https://forum.fhem.de/index.php?topic=133599.0 ",
"5.8.8" => "11.05.2023 _DbLog_ParseEvent changed default splitting, Forum: https://forum.fhem.de/index.php?topic=133537.0 ", "5.8.8" => "11.05.2023 _DbLog_ParseEvent changed default splitting, Forum: https://forum.fhem.de/index.php?topic=133537.0 ",
"5.8.7" => "01.05.2023 new Events FRAME_INITIALIZED, SUBPROC_INITIALIZED, SUBPROC_DISCONNECTED, SUBPROC_STOPPED ". "5.8.7" => "01.05.2023 new Events FRAME_INITIALIZED, SUBPROC_INITIALIZED, SUBPROC_DISCONNECTED, SUBPROC_STOPPED ".
"Forum: https://forum.fhem.de/index.php?topic=133403.0, minor fixes ", "Forum: https://forum.fhem.de/index.php?topic=133403.0, minor fixes ",
"5.8.6" => "25.03.2023 change _DbLog_plotData (intx), Plot Editor: include functions delta-h, delta-h, ...". "5.8.6" => "25.03.2023 change _DbLog_plotData (intx), Plot Editor: include functions delta-h, delta-h, ...".
"remove setter deleteOldDaysNbl, reduceLogNbl ", "remove setter deleteOldDaysNbl, reduceLogNbl ",
"5.8.5" => "16.03.2023 fix using https in configCheck after SVN server change ", "5.8.5" => "16.03.2023 fix using https in configCheck after SVN server change ",
@ -1025,7 +1027,7 @@ sub _DbLog_setexportCache { ## no critic "not used"
my $logsref = $paref->{logsref}; my $logsref = $paref->{logsref};
my $dir = $paref->{dir}; my $dir = $paref->{dir};
return "Device is not in asynch working mode" if(!AttrVal($name, 'asyncMode', 0)); # return "Device is not in asynch working mode" if(!AttrVal($name, 'asyncMode', 0));
my $cln; my $cln;
my $crows = 0; my $crows = 0;
@ -5467,15 +5469,25 @@ sub DbLog_SBP_Read {
if ($oper =~ /log_/xs) { if ($oper =~ /log_/xs) {
my $rowlback = $ret->{rowlback}; my $rowlback = $ret->{rowlback};
if($rowlback) { # one Transaction if($rowlback) {
my $memcount; my $memcount;
eval { eval { # one Transaction
for my $key (sort {$a <=>$b} keys %{$rowlback}) { for my $key (sort {$a <=>$b} keys %{$rowlback}) {
$memcount = DbLog_addMemCacheRow ($name, $rowlback->{$key}); # Datensatz zum Memory Cache hinzufügen $memcount = DbLog_addMemCacheRow ($name, $rowlback->{$key}); # Datensatz zum Memory Cache hinzufügen
Log3 ($name, 5, "DbLog $name - row back to Cache: $key -> ".$rowlback->{$key}); Log3 ($name, 5, "DbLog $name - row back to Cache: $key -> ".$rowlback->{$key});
} }
if ($hash->{HELPER}{SHUTDOWNSEQ} && $memcount) {
Log3 ($name, 2, "DbLog $name - an error occurred during the last write cycle to the database, the data is exported to a file instead ... ......");
my $error = CommandSet (undef, qq{$name exportCache purgecache});
if ($error) { # Fehler beim Export Cachefile
Log3 ($name, 1, "DbLog $name - ERROR - while exporting Cache file: $error");
}
}
}; };
readingsSingleUpdate ($hash, 'CacheUsage', $memcount, ($ce == 1 ? 1 : 0)); readingsSingleUpdate ($hash, 'CacheUsage', $memcount, ($ce == 1 ? 1 : 0));