code styöe
This commit is contained in:
parent
b0a134e779
commit
6556675b49
33
98_backup.pm
33
98_backup.pm
@ -32,8 +32,10 @@ use FHEM::Meta;
|
||||
|
||||
#####################################
|
||||
sub backup_Initialize($$) {
|
||||
my %hash = ( Fn => 'FHEM::backup::CommandBackup',
|
||||
Hlp => ',create a backup of fhem configuration, state and modpath' );
|
||||
my %hash = (
|
||||
Fn => 'FHEM::backup::CommandBackup',
|
||||
Hlp => ',create a backup of fhem configuration, state and modpath'
|
||||
);
|
||||
$cmds{backup} = \%hash;
|
||||
|
||||
return FHEM::Meta::InitMod( __FILE__, \%hash );
|
||||
@ -88,7 +90,8 @@ sub CommandBackup($$) {
|
||||
my $msg;
|
||||
my $ret;
|
||||
|
||||
Log(1, 'NOTE: make sure you have a database backup!') if(configDBUsed());
|
||||
Log( 1, 'NOTE: make sure you have a database backup!' )
|
||||
if ( configDBUsed() );
|
||||
|
||||
# set backupdir
|
||||
my $backupdir;
|
||||
@ -119,6 +122,7 @@ sub CommandBackup($$) {
|
||||
}
|
||||
|
||||
if ( configDBUsed() ) {
|
||||
|
||||
# add configDB configuration file
|
||||
push( @pathname, 'configDB.conf' );
|
||||
Log( 4, 'backup include: \'configDB.conf\'' );
|
||||
@ -150,6 +154,7 @@ sub parseConfig($);
|
||||
|
||||
sub parseConfig($) {
|
||||
my $configfile = shift;
|
||||
|
||||
# we need default value to read included files
|
||||
$configfile = $configfile ? $configfile : 'fhem.cfg';
|
||||
my $fh;
|
||||
@ -171,7 +176,10 @@ sub parseConfig($) {
|
||||
$ret = parseConfig($1);
|
||||
}
|
||||
else {
|
||||
Log(1, 'backup configfile: ' . $1 . ' does not exists! File not included.');
|
||||
Log( 1,
|
||||
'backup configfile: '
|
||||
. $1
|
||||
. ' does not exists! File not included.' );
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -207,8 +215,14 @@ sub readModpath($$) {
|
||||
|
||||
sub createArchiv($$$) {
|
||||
my ( $backupdir, $cl, $byUpdate ) = @_;
|
||||
my $backupcmd = (!defined($attr{global}{backupcmd}) ? undef : $attr{global}{backupcmd});
|
||||
my $symlink = (!defined($attr{global}{backupsymlink}) ? 'no' : $attr{global}{backupsymlink});
|
||||
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;
|
||||
@ -244,9 +258,10 @@ sub createArchiv($$$) {
|
||||
BC_searchTelnet('backup');
|
||||
my $tp = $defs{$BC_telnetDevice}{PORT};
|
||||
|
||||
system("($cmd; echo Backup done;".
|
||||
"$^X $0 localhost:$tp 'trigger global backup done')2>&1 &");
|
||||
return "Started the backup in the background, watch the log for details";
|
||||
system( "($cmd; echo Backup done;"
|
||||
. "$^X $0 localhost:$tp 'trigger global backup done')2>&1 &" );
|
||||
return
|
||||
"Started the backup in the background, watch the log for details";
|
||||
}
|
||||
|
||||
$ret = `($cmd) 2>&1`;
|
||||
|
Loading…
x
Reference in New Issue
Block a user