FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-19 12:46:03 +00:00
Code Issues Releases Wiki Activity

fhem.pl: RType fixes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5657 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2014-04-26 06:53:09 +00:00
parent 9b3a5d0320
commit a306e18676
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/fhem.pl
View File

@ -391,14 +391,6 @@ if($^O =~ m/Win/) {
}
$winService ||= {};
###################################################
# initialize the readings semantics meta information
# this must come before any module is loaded
eval { # make errors non-lethal
require FHEM::RTypes;
RTypes_Initialize();
};
###################################################
# Server initialization
doGlobalDef($ARGV[0]);
@ -417,12 +409,10 @@ setGlobalAttrBeforeFork($attr{global}{configfile});
Log 1, $_ for eval{@{$winService->{ServiceLog}};};
# Go to background if the logfile is a real file (not stdout)
if($^O =~ m/Win/ && !$attr{global}{nofork}) {
$attr{global}{nofork}=1;
}
# Go to background if the logfile is a real file (not stdout)
if($attr{global}{logfile} ne "-" && !$attr{global}{nofork}) {
defined(my $pid = fork) || die "Can't fork: $!";
exit(0) if $pid;
@ -434,6 +424,11 @@ while(time() < 2*3600) {
sleep(5);
}
###################################################
# initialize the readings semantics meta information
require RTypes;
RTypes_Initialize();
my $cfgErrMsg = "Error messages while initializing FHEM:";
my $cfgRet="";
if(configDBUsed()) {
@ -3216,6 +3211,7 @@ setGlobalAttrBeforeFork($)
$v =~ s/#.*//;
$v =~ s/ .*$//;
$attr{global}{$n} = $v;
GlobalAttr("set", "global", $n, $v);
}
close(FH);
}