From 5c1210fb7c75d3489b9749e90afc93d8deef30fb Mon Sep 17 00:00:00 2001 From: betateilchen <> Date: Sun, 25 Mar 2018 18:31:03 +0000 Subject: [PATCH] configDB.pm: move rescue modes from ENV to config file git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@16487 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- configDB.pm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/configDB.pm b/configDB.pm index 98d7a2cee..57e1d9193 100644 --- a/configDB.pm +++ b/configDB.pm @@ -230,10 +230,6 @@ my $cfgDB_dbpass = $dbconfig{password}; my $cfgDB_dbtype; my $cfgDB_filename; -%dbconfig = (); -@config = (); -$configs = undef; -$count = undef; if($cfgDB_dbconn =~ m/pg:/i) { $cfgDB_dbtype ="POSTGRESQL"; @@ -246,15 +242,14 @@ 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} = defined($dbconfig{nostate}) ? $dbconfig{nostate} : 0; $configDB{attr}{rescue} = defined($dbconfig{rescue}) ? $dbconfig{rescue} : 0; $configDB{attr}{loadversion} = defined($dbconfig{loadversion}) ? $dbconfig{loadversion} : 0; -#$configDB{attr}{rescue} = 1; +%dbconfig = (); +@config = (); +$configs = undef; +$count = undef; ################################################## # Basic functions needed for DB configuration