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

configDB.pm: move rescue modes from ENV to config file

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16485 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2018-03-25 18:11:00 +00:00
parent 776062e180
commit 2631415487
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/configDB.pm
View File

@ -246,9 +246,13 @@ if($cfgDB_dbconn =~ m/pg:/i) {
$cfgDB_dbtype = "unknown";
}
$configDB{attr}{nostate} = 1 if($ENV{'cfgDB_nostate'});
$configDB{attr}{rescue} = 1 if($ENV{'cfgDB_rescue'});
$configDB{attr}{loadversion} = $ENV{'cfgDB_version'} ? $ENV{'cfgDB_version'} : 0;
#$configDB{attr}{nostate} = 1 if($ENV{'cfgDB_nostate'});
#$configDB{attr}{rescue} = 1 if($ENV{'cfgDB_rescue'});
#$configDB{attr}{loadversion} = $ENV{'cfgDB_version'} ? $ENV{'cfgDB_version'} : 0;
$configDB{attr}{nostate} = defined($dbconfig{nostate}) ? $dbconfig{nostate} : 0;
$configDB{attr}{rescue} = defined($dbconfig{rescue}) ? $dbconfig{rescue} : 0;
$configDB{attr}{loadversion} = defined($dbconfig{loadversion}) ? $dbconfig{loadversion} : 0;
##################################################
# Basic functions needed for DB configuration
@ -461,7 +465,7 @@ sub cfgDB_ReadAll($) {
my ($cl) = @_;
my ($ret, @dbconfig);
if (defined($configDB{attr}{rescue}) && ($configDB{attr}{rescue} == 1)) {
if ($configDB{attr}{rescue} == 1) {
Log (0, 'configDB starting in rescue mode!');
push (@dbconfig, 'attr global modpath .');
push (@dbconfig, 'attr global verbose 3');
@ -472,7 +476,7 @@ sub cfgDB_ReadAll($) {
# add Config Rows to commandfile
@dbconfig = _cfgDB_ReadCfg(@dbconfig);
# add State Rows to commandfile
@dbconfig = _cfgDB_ReadState(@dbconfig) unless $configDB{attr}{nostate};
@dbconfig = _cfgDB_ReadState(@dbconfig) unless $configDB{attr}{nostate} == 1;
}
# AnalyzeCommandChain for all entries