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_DbRep: minor bugfixes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14731 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2017-07-16 19:40:44 +00:00
parent 48cc949cf9
commit 91aef0a174
2 changed files with 6 additions and 3 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.
- bugfix: 93_DbRep: minor bugfixes (thanks to Omega)
- feature: 49_TBot_List: configure also add with attr confirmUnsolicited - feature: 49_TBot_List: configure also add with attr confirmUnsolicited
- feature: 49_TBot_List: configure confirm delete as attribute confirmDelete - feature: 49_TBot_List: configure confirm delete as attribute confirmDelete
- changed: 98_fheminfo.pm: remove release, featurelevel, uptime infos - changed: 98_fheminfo.pm: remove release, featurelevel, uptime infos

8
fhem/FHEM/93_DbRep.pm
View File

@ -41,6 +41,8 @@
########################################################################################################################### ###########################################################################################################################
# Versions History: # Versions History:
# #
# 5.5.2 16.07.2017 dbmeta_DoParse -> show variables (no global)
# 5.5.1 16.07.2017 wrong text output in state when restoreMySQL was aborted by timeout
# 5.5.0 10.07.2017 replace $hash->{dbloghash}{DBMODEL} by $hash->{dbloghash}{MODEL} (DbLog was changed) # 5.5.0 10.07.2017 replace $hash->{dbloghash}{DBMODEL} by $hash->{dbloghash}{MODEL} (DbLog was changed)
# 5.4.0 03.07.2017 restoreMySQL - restore of csv-files (from dumpServerSide), # 5.4.0 03.07.2017 restoreMySQL - restore of csv-files (from dumpServerSide),
# RestoreRowsHistory/ DumpRowsHistory, Commandref revised # RestoreRowsHistory/ DumpRowsHistory, Commandref revised
@ -231,7 +233,7 @@ use Encode qw(encode_utf8);
sub DbRep_Main($$;$); sub DbRep_Main($$;$);
my $DbRepVersion = "5.5.0"; my $DbRepVersion = "5.5.2";
my %dbrep_col = ("DEVICE" => 64, my %dbrep_col = ("DEVICE" => 64,
"TYPE" => 64, "TYPE" => 64,
@ -982,7 +984,7 @@ sub DbRep_Main($$;$) {
if ($opt =~ /restoreMySQL/) { if ($opt =~ /restoreMySQL/) {
BlockingKill($hash->{HELPER}{RUNNING_BCKPREST_SERVER}) if (exists($hash->{HELPER}{RUNNING_BCKPREST_SERVER})); BlockingKill($hash->{HELPER}{RUNNING_BCKPREST_SERVER}) if (exists($hash->{HELPER}{RUNNING_BCKPREST_SERVER}));
$hash->{HELPER}{RUNNING_BCKPREST_SERVER} = BlockingCall("mysql_RestoreServerSide", "$name|$cmd", "RestoreDone", $to, "DumpAborted", $hash); $hash->{HELPER}{RUNNING_BCKPREST_SERVER} = BlockingCall("mysql_RestoreServerSide", "$name|$cmd", "RestoreDone", $to, "RestoreAborted", $hash);
ReadingsSingleUpdateValue ($hash, "state", "restore database is running - be patient and see Logfile !", 1); ReadingsSingleUpdateValue ($hash, "state", "restore database is running - be patient and see Logfile !", 1);
return; return;
} }
@ -3850,7 +3852,7 @@ sub dbmeta_DoParse($) {
if ($opt ne "svrinfo") { if ($opt ne "svrinfo") {
foreach my $ple (@parlist) { foreach my $ple (@parlist) {
if ($opt eq "dbvars") { if ($opt eq "dbvars") {
$sql = "show global variables like '$ple';"; $sql = "show variables like '$ple';";
} elsif ($opt eq "dbstatus") { } elsif ($opt eq "dbstatus") {
$sql = "show global status like '$ple';"; $sql = "show global status like '$ple';";
} elsif ($opt eq "tableinfo") { } elsif ($opt eq "tableinfo") {