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

93_DbRep: minor fixes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25397 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2022-01-01 12:41:02 +00:00
parent 90588b2bf5
commit 1c9666133e
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fhem/FHEM/93_DbRep.pm
View File

@ -3,7 +3,7 @@
########################################################################################################## ##########################################################################################################
# 93_DbRep.pm # 93_DbRep.pm
# #
# (c) 2016-2021 by Heiko Maaz # (c) 2016-2022 by Heiko Maaz
# e-mail: Heiko dot Maaz at t-online dot de # e-mail: Heiko dot Maaz at t-online dot de
# #
# This Module can be used to select and report content of databases written by 93_DbLog module # This Module can be used to select and report content of databases written by 93_DbLog module
@ -57,6 +57,7 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch';
# Version History intern # Version History intern
my %DbRep_vNotesIntern = ( my %DbRep_vNotesIntern = (
"8.46.9" => "01.01.2022 minor fixes ",
"8.46.8" => "30.12.2021 some code refacturing and minor bug fixing ", "8.46.8" => "30.12.2021 some code refacturing and minor bug fixing ",
"8.46.7" => "27.12.2021 some code improvements, insert accept a multiline string ", "8.46.7" => "27.12.2021 some code improvements, insert accept a multiline string ",
"8.46.6" => "26.12.2021 sub sqlCmd_DoParse uses credentials dependend of attr useAdminCredentials ". "8.46.6" => "26.12.2021 sub sqlCmd_DoParse uses credentials dependend of attr useAdminCredentials ".
@ -7793,8 +7794,7 @@ sub DbRep_OptimizeDone {
delete($hash->{HELPER}{RUNNING_OPTIMIZE}); delete($hash->{HELPER}{RUNNING_OPTIMIZE});
my $erread = DbRep_afterproc ($hash, "optimize"); # Befehl nach Procedure ausführen my ($erread, $state) = DbRep_afterproc ($hash, "optimize"); # Befehl nach Procedure ausführen
my $state = $erread // "optimize tables finished";
if ($err) { if ($err) {
ReadingsSingleUpdateValue ($hash, "errortext", $err, 1); ReadingsSingleUpdateValue ($hash, "errortext", $err, 1);
@ -8608,8 +8608,7 @@ sub DbRep_DumpDone {
delete($hash->{HELPER}{RUNNING_BACKUP_CLIENT}); delete($hash->{HELPER}{RUNNING_BACKUP_CLIENT});
delete($hash->{HELPER}{RUNNING_BCKPREST_SERVER}); delete($hash->{HELPER}{RUNNING_BCKPREST_SERVER});
my $erread = DbRep_afterproc ($hash, "dump"); # Befehl nach Procedure ausführen my ($erread, $state) = DbRep_afterproc ($hash, "dump"); # Befehl nach Procedure ausführen
my $state = $erread // "Database backup finished";
if ($err) { if ($err) {
ReadingsSingleUpdateValue ($hash, "errortext", $err, 1); ReadingsSingleUpdateValue ($hash, "errortext", $err, 1);
@ -8717,8 +8716,7 @@ sub DbRep_RepairDone {
delete($hash->{HELPER}{RUNNING_REPAIR}); delete($hash->{HELPER}{RUNNING_REPAIR});
my $erread = DbRep_afterproc ($hash, "repair"); # Befehl nach Procedure ausführen my ($erread, $state) = DbRep_afterproc ($hash, "repair"); # Befehl nach Procedure ausführen
my $state = $erread // "Repair finished $hash->{DATABASE}";
# Datenbankverbindung in DbLog wieder öffenen # Datenbankverbindung in DbLog wieder öffenen
my $dbl = $dbloghash->{NAME}; my $dbl = $dbloghash->{NAME};
@ -9069,8 +9067,7 @@ sub DbRep_restoreDone {
delete($hash->{HELPER}{RUNNING_RESTORE}); delete($hash->{HELPER}{RUNNING_RESTORE});
my $erread = DbRep_afterproc ($hash, "restore"); # Befehl nach Procedure ausführen my ($erread, $state) = DbRep_afterproc ($hash, "restore", $bfile); # Befehl nach Procedure ausführen
my $state = $erread // "Restore of $bfile finished";
if ($err) { if ($err) {
ReadingsSingleUpdateValue ($hash, "errortext", $err, 1); ReadingsSingleUpdateValue ($hash, "errortext", $err, 1);
@ -9744,8 +9741,7 @@ sub DbRep_reduceLogDone {
delete $hash->{HELPER}{RUNNING_REDUCELOG}; delete $hash->{HELPER}{RUNNING_REDUCELOG};
delete $hash->{HELPER}{REDUCELOG}; delete $hash->{HELPER}{REDUCELOG};
my $erread = DbRep_afterproc ($hash, "reduceLog"); # Befehl nach Procedure ausführen my ($erread, $state) = DbRep_afterproc ($hash, "reduceLog"); # Befehl nach Procedure ausführen
my $state = $erread // "reduceLog of $hash->{DATABASE} finished";
if ($err) { if ($err) {
ReadingsSingleUpdateValue ($hash, "errortext", $err, 1); ReadingsSingleUpdateValue ($hash, "errortext", $err, 1);
@ -10977,25 +10973,34 @@ return;
################################################################################### ###################################################################################
sub DbRep_afterproc { sub DbRep_afterproc {
my $hash = shift; my $hash = shift;
my $txt = shift; my $cmd = shift;
my $bfile = shift // q{};
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $erread; my $erread;
my $ead = AttrVal($name, "executeAfterProc", ""); my $ead = AttrVal($name, "executeAfterProc", "");
if($ead) { if($ead) {
Log3 ($name, 4, "DbRep $name - execute command after $txt: '$ead' "); Log3 ($name, 4, "DbRep $name - execute command after $cmd: '$ead' ");
my $err = AnalyzeCommandChain(undef, $ead); my $err = AnalyzeCommandChain(undef, $ead);
if ($err) { if ($err) {
Log3 ($name, 2, qq{DbRep $name - command message after $txt: "$err"}); Log3 ($name, 2, qq{DbRep $name - command message after $cmd: "$err"});
ReadingsSingleUpdateValue ($hash, "after".$txt."_message", $err, 1); ReadingsSingleUpdateValue ($hash, "after".$cmd."_message", $err, 1);
$erread = qq{WARNING - $txt finished, but message after command appeared}; $erread = qq{WARNING - $cmd finished, but message after command appeared};
} }
} }
my $state = $erread // "done"; my $rtxt = $cmd eq "dump" ? "Database backup finished" :
$cmd eq "repair" ? "Repair finished $hash->{DATABASE}" :
$cmd eq "restore" ? "Restore of $bfile finished" :
$cmd eq "reduceLog" ? "reduceLog of $hash->{DATABASE} finished" :
$cmd eq "optimize" ? "optimize tables finished" :
"done";
my $state = $erread // $rtxt;
return ($erread, $state); return ($erread, $state);
} }