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

93_DbRep: contrib DbRep 8.0.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17326 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2018-09-11 17:08:03 +00:00
parent e60d131d86
commit bf400491df
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/contrib/DS_Starter/93_DbRep.pm
View File

@ -38,6 +38,7 @@
# Versions History: # Versions History:
# #
# 8.0.0 07.09.2018 get filesize in DbRep_WriteToDumpFile corrected, restoreMySQL for clientSide dumps # 8.0.0 07.09.2018 get filesize in DbRep_WriteToDumpFile corrected, restoreMySQL for clientSide dumps
# minor fixes
# 7.20.0 04.09.2018 deviceRename can operate a Device name with blank, e.g. 'current balance' as old device name # 7.20.0 04.09.2018 deviceRename can operate a Device name with blank, e.g. 'current balance' as old device name
# 7.19.0 25.08.2018 attribute "valueFilter" to filter datasets in fetchrows # 7.19.0 25.08.2018 attribute "valueFilter" to filter datasets in fetchrows
# 7.18.2 02.08.2018 fix in fetchrow function (forum:#89886), fix highlighting # 7.18.2 02.08.2018 fix in fetchrow function (forum:#89886), fix highlighting
@ -8426,6 +8427,7 @@ sub DbRep_deldumpfiles ($$) {
my $dbloghash = $hash->{dbloghash}; my $dbloghash = $hash->{dbloghash};
my $dump_path_def = $attr{global}{modpath}."/log/"; my $dump_path_def = $attr{global}{modpath}."/log/";
my $dump_path_loc = AttrVal($name,"dumpDirLocal", $dump_path_def); my $dump_path_loc = AttrVal($name,"dumpDirLocal", $dump_path_def);
$dump_path_loc = $dump_path_loc."/" unless($dump_path_loc =~ m/\/$/);
my $dfk = AttrVal($name,"dumpFilesKeep", 3); my $dfk = AttrVal($name,"dumpFilesKeep", 3);
my $pfix = (split '\.', $bfile)[1]; my $pfix = (split '\.', $bfile)[1];
my $dbname = (split '_', $bfile)[0]; my $dbname = (split '_', $bfile)[0];
@ -8437,8 +8439,17 @@ sub DbRep_deldumpfiles ($$) {
return @fd; return @fd;
} }
my @files = sort grep {/^$file$/} readdir(DH); my @files = sort grep {/^$file$/} readdir(DH);
@files = sort { (@{stat("$dump_path_loc/$a")})[9] cmp (@{stat("$dump_path_loc/$b")})[9] } @files
if(AttrVal("global", "archivesort", "alphanum") eq "timestamp"); my $fref = stat("$dump_path_loc/$bfile");
if ($fref =~ /ARRAY/) {
@files = sort { (@{stat("$dump_path_loc/$a")})[9] cmp (@{stat("$dump_path_loc/$b")})[9] } @files
if(AttrVal("global", "archivesort", "alphanum") eq "timestamp");
} else {
@files = sort { (stat("$dump_path_loc/$a"))[9] cmp (stat("$dump_path_loc/$b"))[9] } @files
if(AttrVal("global", "archivesort", "alphanum") eq "timestamp");
}
closedir(DH); closedir(DH);
Log3($name, 5, "DbRep $name - Dump files have been found in dumpDirLocal '$dump_path_loc': ".join(', ',@files) ); Log3($name, 5, "DbRep $name - Dump files have been found in dumpDirLocal '$dump_path_loc': ".join(', ',@files) );
@ -11653,7 +11664,7 @@ sub bdump {
<ul> <ul>
<table> <table>
<colgroup> <col width=5%> <col width=95%> </colgroup> <colgroup> <col width=5%> <col width=95%> </colgroup>
<tr><td> dumpDirRemote </td><td>: das Erstellungsverzeichnis des Dumpfile dem entfernten Server </td></tr> <tr><td> dumpDirRemote </td><td>: das Erstellungsverzeichnis des Dumpfile auf dem entfernten Server </td></tr>
<tr><td> dumpCompress </td><td>: Komprimierung des Dumpfiles nach der Erstellung </td></tr> <tr><td> dumpCompress </td><td>: Komprimierung des Dumpfiles nach der Erstellung </td></tr>
<tr><td> dumpDirLocal </td><td>: Directory des lokal gemounteten dumpDirRemote-Verzeichnisses </td></tr> <tr><td> dumpDirLocal </td><td>: Directory des lokal gemounteten dumpDirRemote-Verzeichnisses </td></tr>
<tr><td> dumpFilesKeep </td><td>: Anzahl der aufzubwahrenden Dumpfiles </td></tr> <tr><td> dumpFilesKeep </td><td>: Anzahl der aufzubwahrenden Dumpfiles </td></tr>