mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-05-04 22:19:38 +00:00
configdb - removed: backup
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@5907 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen
parent
fa771035dd
commit
03d0820fe2
@ -17,117 +17,6 @@ sub configdb_Initialize($$) {
|
|||||||
$cmds{configdb} = \%hash;
|
$cmds{configdb} = \%hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
#####################################
|
|
||||||
|
|
||||||
sub _configdb_rM($$) {
|
|
||||||
# read moddir
|
|
||||||
my ($modpath,$backupdir) = @_;
|
|
||||||
my $msg;
|
|
||||||
my $ret;
|
|
||||||
|
|
||||||
if (!opendir(DH, $modpath)) {
|
|
||||||
$msg = "Can't open $modpath: $!";
|
|
||||||
Log 1, "backup $msg";
|
|
||||||
return $msg;
|
|
||||||
}
|
|
||||||
my @files = <$modpath/*>;
|
|
||||||
foreach my $file (@files) {
|
|
||||||
if ($file eq $backupdir && (-d $file || -l $file)) {
|
|
||||||
Log 4, "backup exclude: '$file'";
|
|
||||||
} else {
|
|
||||||
Log 4, "backup include: '$file'";
|
|
||||||
push @pathname, $file;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return $ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub _configdb_cA($) {
|
|
||||||
# create archive
|
|
||||||
my $backupdir = shift;
|
|
||||||
my $backupcmd = (!defined($attr{global}{backupcmd}) ? undef : $attr{global}{backupcmd});
|
|
||||||
my $symlink = (!defined($attr{global}{backupsymlink}) ? "no" : $attr{global}{backupsymlink});
|
|
||||||
my $tarOpts;
|
|
||||||
my $msg;
|
|
||||||
my $ret;
|
|
||||||
|
|
||||||
my $dateTime = TimeNow();
|
|
||||||
$dateTime =~ s/ /_/g;
|
|
||||||
$dateTime =~ s/(:|-)//g;
|
|
||||||
|
|
||||||
my $cmd="";
|
|
||||||
if (!defined($backupcmd)) {
|
|
||||||
if (lc($symlink) eq "no") {
|
|
||||||
$tarOpts = "cf";
|
|
||||||
} else {
|
|
||||||
$tarOpts = "chf";
|
|
||||||
}
|
|
||||||
|
|
||||||
# prevents tar's output of "Removing leading /" and return total bytes of archive
|
|
||||||
$cmd = "tar -$tarOpts - @pathname |gzip > $backupdir/FHEM-$dateTime.tar.gz";
|
|
||||||
|
|
||||||
} else {
|
|
||||||
$cmd = "$backupcmd \"@pathname\"";
|
|
||||||
|
|
||||||
}
|
|
||||||
Log 2, "Backup with command: $cmd";
|
|
||||||
$ret = `($cmd) 2>&1`;
|
|
||||||
|
|
||||||
if($ret) {
|
|
||||||
chomp $ret;
|
|
||||||
Log 1, "backup $ret";
|
|
||||||
}
|
|
||||||
if (!defined($backupcmd) && -e "$backupdir/FHEM-$dateTime.tar.gz") {
|
|
||||||
my $size = -s "$backupdir/FHEM-$dateTime.tar.gz";
|
|
||||||
$msg = "backup done: FHEM-$dateTime.tar.gz ($size Bytes)";
|
|
||||||
Log 1, $msg;
|
|
||||||
$ret .= "\n".$msg;
|
|
||||||
}
|
|
||||||
return $ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub _configdb_backup {
|
|
||||||
my $modpath = $attr{global}{modpath};
|
|
||||||
my $msg;
|
|
||||||
my $ret;
|
|
||||||
|
|
||||||
# set backupdir
|
|
||||||
my $backupdir;
|
|
||||||
if (!defined($attr{global}{backupdir})) {
|
|
||||||
$backupdir = "$modpath/backup";
|
|
||||||
} else {
|
|
||||||
if ($attr{global}{backupdir} =~ m/^\/.*/) {
|
|
||||||
$backupdir = $attr{global}{backupdir};
|
|
||||||
} elsif ($attr{global}{backupdir} =~ m/^\.+\/.*/) {
|
|
||||||
$backupdir = "$modpath/$attr{global}{backupdir}";
|
|
||||||
} else {
|
|
||||||
$backupdir = "$modpath/$attr{global}{backupdir}";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# create backupdir if not exists
|
|
||||||
if (!-d $backupdir) {
|
|
||||||
Log 4, "backup create backupdir: '$backupdir'";
|
|
||||||
$ret = `(mkdir -p $backupdir) 2>&1`;
|
|
||||||
if ($ret) {
|
|
||||||
chomp $ret;
|
|
||||||
$msg = "backup: $ret";
|
|
||||||
return $msg;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# get pathnames to archiv
|
|
||||||
$ret = _configdb_rM($modpath,$backupdir);
|
|
||||||
|
|
||||||
# create archiv
|
|
||||||
$ret = _configdb_cA($backupdir);
|
|
||||||
|
|
||||||
@pathname = [];
|
|
||||||
undef @pathname;
|
|
||||||
|
|
||||||
return $ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub CommandConfigdb($$) {
|
sub CommandConfigdb($$) {
|
||||||
my ($cl, $param) = @_;
|
my ($cl, $param) = @_;
|
||||||
|
|
||||||
@ -166,16 +55,6 @@ sub CommandConfigdb($$) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
when ('backup') {
|
|
||||||
if($^O =~ m/Win/) {
|
|
||||||
Log3('configdb', 4, "configdb: error: backup requested on MS platform.");
|
|
||||||
$ret = "\n error: backup not supported for Windows";
|
|
||||||
} else {
|
|
||||||
Log3('configdb', 4, "configdb: backup requested.");
|
|
||||||
$ret = _configdb_backup;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
when ('diff') {
|
when ('diff') {
|
||||||
return "\n Syntax: configdb diff <device> <version>" if @a != 3;
|
return "\n Syntax: configdb diff <device> <version>" if @a != 3;
|
||||||
Log3('configdb', 4, "configdb: diff requested for device: $param1 in version $param2.");
|
Log3('configdb', 4, "configdb: diff requested for device: $param1 in version $param2.");
|
||||||
@ -225,10 +104,6 @@ sub CommandConfigdb($$) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
when ('binfileimport') {
|
|
||||||
return "\n configdb binfileimport is deprecated.\n Please use configdb fileimport.";
|
|
||||||
}
|
|
||||||
|
|
||||||
when ('filelist') {
|
when ('filelist') {
|
||||||
return _cfgDB_Filelist;
|
return _cfgDB_Filelist;
|
||||||
}
|
}
|
||||||
@ -306,7 +181,6 @@ sub CommandConfigdb($$) {
|
|||||||
default {
|
default {
|
||||||
$ret = "\n Syntax:\n".
|
$ret = "\n Syntax:\n".
|
||||||
" configdb attr [attribute] [value]\n".
|
" configdb attr [attribute] [value]\n".
|
||||||
" configdb backup\n".
|
|
||||||
" configdb diff <device> <version>\n".
|
" configdb diff <device> <version>\n".
|
||||||
" configDB filedelete <pathToFilename>\n".
|
" configDB filedelete <pathToFilename>\n".
|
||||||
" configDB fileimport <pathToFilename>\n".
|
" configDB fileimport <pathToFilename>\n".
|
||||||
@ -483,15 +357,6 @@ sub CommandConfigdb($$) {
|
|||||||
will not be shown in 'configdb info' output.<br/>
|
will not be shown in 'configdb info' output.<br/>
|
||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
<li><code>configdb backup</code></li><br/>
|
|
||||||
Replaces fhem's default backup process, since backup is no longer supported <br/>
|
|
||||||
with activated configDB.<br/>
|
|
||||||
<br/>
|
|
||||||
<b>Important:</b><br/>
|
|
||||||
Please be aware you are responsible for data backup of your database yourself!<br/>
|
|
||||||
The backup command can and will not do this job for you!<br/>
|
|
||||||
<br/>
|
|
||||||
|
|
||||||
<li><code>configdb diff <device> <version></code></li><br/>
|
<li><code>configdb diff <device> <version></code></li><br/>
|
||||||
Compare configuration dataset for device <device>
|
Compare configuration dataset for device <device>
|
||||||
from current version 0 with version <version><br/>
|
from current version 0 with version <version><br/>
|
||||||
@ -809,17 +674,6 @@ attr Melder_FAr peerIDs 00000000,2286BC03,
|
|||||||
<br/>
|
<br/>
|
||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
<li><code>configdb backup</code></li><br/>
|
|
||||||
Ersetzt den Standard-Backup-Befehl von fhem, da dieser bei Verwendung von configDB nicht mehr<br/>
|
|
||||||
zur Verfügung steht.<br/>
|
|
||||||
<br/>
|
|
||||||
<b>Wichtig:</b><br/>
|
|
||||||
Für die Sicherung der Datenbank ist der Anwender selbst verantwortlich!<br/>
|
|
||||||
Der backup Befehl kann diese Aufgabe nicht übernehmen.<br/>
|
|
||||||
Ausnahme: Nutzer einer im fhem Verzeichnis liegenden sqlite Datenbank profitieren von der Einfachheit<br/>
|
|
||||||
dieser Datenbank, denn das fhem Verzeichnis wird ohnehin komplett gesichert.<br/>
|
|
||||||
<br/>
|
|
||||||
|
|
||||||
<li><code>configdb diff <device> <version></code></li><br/>
|
<li><code>configdb diff <device> <version></code></li><br/>
|
||||||
Vergleicht die Konfigurationsdaten des Gerätes <device> aus der aktuellen Version 0 mit den Daten aus Version <version><br/>
|
Vergleicht die Konfigurationsdaten des Gerätes <device> aus der aktuellen Version 0 mit den Daten aus Version <version><br/>
|
||||||
Beispielaufruf:<br/>
|
Beispielaufruf:<br/>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user