FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-13 23:36:37 +00:00
Code Issues Releases Wiki Activity

fhem.pl: exec IODev search for rereadcfg (Forum #118743)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23748 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2021-02-15 17:22:42 +00:00
parent 79b6236d8c
commit dfa4f1af42
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fhem/fhem.pl
View File

@ -635,27 +635,35 @@ if($pfn) {
$init_done = 1; $init_done = 1;
$lastDefChange = 1; $lastDefChange = 1;
foreach my $d (keys %defs) { sub
finish_init()
{
foreach my $d (keys %defs) {
if($defs{$d}{IODevMissing}) { if($defs{$d}{IODevMissing}) {
if($defs{$d}{IODevName} && $defs{$defs{$d}{IODevName}}) { if($defs{$d}{IODevName} && $defs{$defs{$d}{IODevName}}) {
$defs{$d}{IODev} = $defs{$defs{$d}{IODevName}}; $defs{$d}{IODev} = $defs{$defs{$d}{IODevName}};
delete $defs{$d}{IODevName}; delete $defs{$d}{IODevName};
} else { } else {
AssignIoPort($defs{$d}); # For fhem.cfg editors? Needs init_done for Log. AssignIoPort($defs{$d}); # For fhem.cfg editors?
} }
delete $defs{$d}{IODevMissing}; delete $defs{$d}{IODevMissing};
} }
} }
my $init_errors_first = ($defs{global}{init_errors} ? 1 : 0); my $init_errors_first = ($defs{global}{init_errors} ? 1 : 0);
SecurityCheck(); SecurityCheck();
if($defs{global}{init_errors}) { if($defs{global}{init_errors}) {
$attr{global}{autosave} = 0 if($init_errors_first); $attr{global}{autosave} = 0 if($init_errors_first);
$defs{global}{init_errors} = "Messages collected while initializing FHEM:". $defs{global}{init_errors} =
"Messages collected while initializing FHEM:".
"$defs{global}{init_errors}\n". "$defs{global}{init_errors}\n".
($init_errors_first ? "Autosave deactivated" : ""); ($init_errors_first ? "Autosave deactivated" : "");
Log 1, $defs{global}{init_errors} if(AttrVal("global","motd","") ne "none"); Log 1, $defs{global}{init_errors}
if(AttrVal("global","motd","") ne "none");
}
} }
finish_init();
$fhem_started = int(gettimeofday()); $fhem_started = int(gettimeofday());
@ -1504,10 +1512,14 @@ CommandRereadCfg($$)
} }
applyGlobalAttrFromEnv(); applyGlobalAttrFromEnv();
$defs{$name} = $selectlist{$name} = $cl if($name && $name ne "__anonymous__"); $defs{$name} = $selectlist{$name} = $cl
if($name && $name ne "__anonymous__");
$inform{$name} = $informMe if($informMe); $inform{$name} = $informMe if($informMe);
@structChangeHist = (); @structChangeHist = ();
$lastDefChange++; $lastDefChange++;
finish_init();
DoTrigger("global", "REREADCFG", 1); DoTrigger("global", "REREADCFG", 1);
$init_done = 1; $init_done = 1;