FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 08:11:44 +00:00
Code Issues Releases Wiki Activity

backup.pl: backup is always started in the background (Forum #80237)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15522 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-11-29 21:50:39 +00:00
parent 3fd7f8a7d2
commit c9053ddb9b
3 changed files with 4 additions and 1 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.
- change: backup is always started in the background (Forum #80237)
- bugfix: 72_FB_CALLMONITOR: fix not working reverse-search-phonebook - bugfix: 72_FB_CALLMONITOR: fix not working reverse-search-phonebook
file import file import
- change: 93_DbLog: V2.22.15, some Log verbose level adapted/added - change: 93_DbLog: V2.22.15, some Log verbose level adapted/added

2
fhem/FHEM/98_backup.pm
View File

@ -197,7 +197,7 @@ createArchiv($$)
} }
Log 2, "Backup with command: $cmd"; Log 2, "Backup with command: $cmd";
if($cl && ref($cl) eq "HASH" && $cl->{TYPE} && $cl->{TYPE} eq "FHEMWEB") { if(!$fhemForked) {
use Blocking; use Blocking;
our $BC_telnetDevice; our $BC_telnetDevice;
BC_searchTelnet("backup"); BC_searchTelnet("backup");

2
fhem/fhem.pl
View File

@ -247,6 +247,7 @@ use vars qw(@authorize); # List of authorization devices
use vars qw(@structChangeHist); # Contains the last 10 structural changes use vars qw(@structChangeHist); # Contains the last 10 structural changes
use vars qw($haveInet6); # Using INET6 use vars qw($haveInet6); # Using INET6
use vars qw(%prioQueues); # use vars qw(%prioQueues); #
use vars qw($fhemForked); # 1 in a fhemFork()'ed process, else undef
$selectTimestamp = gettimeofday(); $selectTimestamp = gettimeofday();
$cvsid = '$Id$'; $cvsid = '$Id$';
@ -5006,6 +5007,7 @@ fhemFork()
} }
} }
$SIG{CHLD} = 'DEFAULT'; # Forum #50898 $SIG{CHLD} = 'DEFAULT'; # Forum #50898
$fhemForked = 1;
return 0; return 0;
} }