FHEM/mod-backup
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove prototypen

Browse Source 
add developer infos
This commit is contained in:
Marko Oldenburg 2020-06-17 12:18:32 +02:00
parent 3458f00b89
commit f9530e6cd3
1 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
98_backup.pm
View File

@ -34,11 +34,13 @@ use warnings;
use FHEM::Meta; use FHEM::Meta;
##################################### #####################################
sub backup_Initialize($$) { sub backup_Initialize {
my %hash = ( my %hash = (
Fn => 'FHEM::backup::CommandBackup', Fn => 'FHEM::backup::CommandBackup',
Hlp => ',create a backup of fhem configuration, state and modpath' Hlp => ',create a backup of fhem configuration, state and modpath'
); );
$cmds{backup} = \%hash; $cmds{backup} = \%hash;
return FHEM::Meta::InitMod( __FILE__, \%hash ); return FHEM::Meta::InitMod( __FILE__, \%hash );
@ -78,21 +80,24 @@ BEGIN {
my @pathname; my @pathname;
sub CommandBackup($$) { sub CommandBackup {
my ( $cl, $param ) = @_; my $cl = shift;
my $param = shift;
my $byUpdate = ( $param && $param eq 'startedByUpdate' ); my $byUpdate = ( $param && $param eq 'startedByUpdate' );
my $modpath = AttrVal( 'global', 'modpath', '.' ); my $modpath = AttrVal( 'global', 'modpath', '.' );
my $configfile = AttrVal( 'global', 'configfile', $modpath . '/fhem.cfg' ); my $configfile = AttrVal( 'global', 'configfile', $modpath . '/fhem.cfg' );
my $statefile = AttrVal( 'global', 'statefile', $modpath . '/log/fhem.save' ); my $statefile = AttrVal( 'global', 'statefile', $modpath . '/log/fhem.save' );
my $dir = AttrVal( 'global', 'backupdir', $modpath . '/backup'); my $dir = AttrVal( 'global', 'backupdir', $modpath . '/backup');
my $now = gettimeofday(); my $now = gettimeofday();
my @t = localtime($now); my @t = localtime($now);
$statefile = ResolveDateWildcards( $statefile, @t ); my $dateTime = dateTime();
$statefile = ResolveDateWildcards( $statefile, @t );
# prevent duplicate entries in backup list for default config, forum #54826 # prevent duplicate entries in backup list for default config, forum #54826
$configfile = '' if ( $configfile eq 'fhem.cfg' || configDBUsed() ); $configfile = '' if ( $configfile eq 'fhem.cfg' || configDBUsed() );
$statefile = '' if ( $statefile eq './log/fhem.save' ); $statefile = '' if ( $statefile eq './log/fhem.save' );
my $msg; my $msg;
my $ret; my $ret;
@ -115,7 +120,7 @@ sub CommandBackup($$) {
@pathname = keys %all; @pathname = keys %all;
# create archiv # create archiv
$ret = createArchiv( $backupdir, $cl, $byUpdate ); $ret = createArchiv( $backupdir, $cl, $byUpdate, $dateTime );
@pathname = []; @pathname = [];
undef @pathname; undef @pathname;
@ -123,8 +128,10 @@ sub CommandBackup($$) {
return $ret; return $ret;
} }
sub addConfDBFiles($$) { sub addConfDBFiles {
my ($configfile,$statefile) = @_; my $configfile = shift;
my $statefile = shift;
my $ret; my $ret;
if ( configDBUsed() ) { if ( configDBUsed() ) {
@ -154,8 +161,9 @@ sub addConfDBFiles($$) {
return $ret; return $ret;
} }
sub createBackupDir($$) { sub createBackupDir {
my ($dir,$modpath) = @_; my $dir = shift;
my $modpath = shift;
my $msg; my $msg;
my $ret; my $ret;
@ -175,9 +183,7 @@ sub createBackupDir($$) {
return (undef,$backupdir); return (undef,$backupdir);
} }
sub parseConfig($); sub parseConfig {
sub parseConfig($) {
my $configfile = shift; my $configfile = shift;
# we need default value to read included files # we need default value to read included files
@ -213,8 +219,10 @@ sub parseConfig($) {
return $ret; return $ret;
} }
sub readModpath($$) { sub readModpath {
my ( $modpath, $backupdir ) = @_; my $modpath = shift;
my $backupdir = shift;
my $msg; my $msg;
my $ret; my $ret;
@ -238,17 +246,22 @@ sub readModpath($$) {
return $ret; return $ret;
} }
sub createArchiv($$$) { sub dateTime {
my ( $backupdir, $cl, $byUpdate ) = @_;
my $backupcmd = AttrVal('global','backupcmd',undef);
my $symlink = AttrVal('global','backupsymlink','no');
my $tarOpts;
my $msg;
my $ret;
my $dateTime = TimeNow(); my $dateTime = TimeNow();
$dateTime =~ s/ /_/g; $dateTime =~ s/ /_/g;
$dateTime =~ s/(:|-)//g; $dateTime =~ s/(:|-)//g;
return $dateTime;
}
sub createArchiv {
my ($backupdir, $cl, $byUpdate, $dateTime) = @_;
my $backupcmd = AttrVal('global','backupcmd',undef);
my $symlink = AttrVal('global','backupsymlink','no');
my $tarOpts;
my $msg;
my $ret;
my $pathlist = join( '" "', @pathname ); my $pathlist = join( '" "', @pathname );
@ -263,7 +276,6 @@ sub createArchiv($$$) {
# prevents tar's output of "Removing leading /" and return total bytes of # prevents tar's output of "Removing leading /" and return total bytes of
# archive # archive
# $cmd = "tar -$tarOpts - \"$pathlist\" |gzip > $backupdir/FHEM-$dateTime.tar.gz";
$cmd = "tar $tarOpts $backupdir/FHEM-$dateTime.tar.gz \"$pathlist\""; $cmd = "tar $tarOpts $backupdir/FHEM-$dateTime.tar.gz \"$pathlist\"";
} }
else { else {
@ -279,6 +291,7 @@ sub createArchiv($$$) {
system( "($cmd; echo Backup done;" system( "($cmd; echo Backup done;"
. "$^X $0 localhost:$tp 'trigger global backup done')2>&1 &" ); . "$^X $0 localhost:$tp 'trigger global backup done')2>&1 &" );
return return
"Started the backup in the background, watch the log for details"; "Started the backup in the background, watch the log for details";
} }
@ -301,9 +314,7 @@ sub createArchiv($$$) {
return $ret; return $ret;
} }
sub addLogPathToPathnameArray() { sub addLogPathToPathnameArray {
# my $modpath = shift;
my $ret; my $ret;
my @logpathname; my @logpathname;
my $extlogpath; my $extlogpath;
@ -380,7 +391,7 @@ sub addLogPathToPathnameArray() {
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <fhemsupport@cooltux.net>"
], ],
"x_fhem_maintainer": [ "x_fhem_maintainer": [
"CoolTux" "CoolTux"