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

configDB.pm: rescue mode added

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10322 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2016-01-01 18:33:43 +00:00
parent 0415f44d7d
commit 78280796cd
2 changed files with 19 additions and 28 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.
# Do not insert empty lines here, update check depends on it.
- feature: configDB: rescue mode added, read forum #46538
- changed: 49_SSCam: documentation changed
HINT: use IP-Adresses instead of hostnames in SSCAM-Define!
- bugfix: FB_CALLLIST: fix not working longpoll update in FHEMWEB

46
fhem/configDB.pm
View File

@ -115,6 +115,7 @@ use DBI;
# Forward declarations for functions in fhem.pl
#
sub AnalyzeCommandChain($$;$);
sub Log($$);
sub Log3($$$);
sub createUniqueId();
@ -146,7 +147,6 @@ sub _cfgDB_Fileexport($;$);
sub _cfgDB_Filelist(;$);
sub _cfgDB_Info();
sub _cfgDB_Migrate();
sub _cfgDB_Move();
sub _cfgDB_ReadCfg(@);
sub _cfgDB_ReadState(@);
sub _cfgDB_Recover($);
@ -190,7 +190,7 @@ if($cfgDB_dbconn =~ m/pg:/i) {
}
$configDB{attr}{nostate} = 1 if($ENV{'cfgDB_nostate'});
$configDB{attr}{rescue} = 1 if($ENV{'cfgDB_rescue'});
##################################################
# Basic functions needed for DB configuration
@ -242,31 +242,10 @@ sub cfgDB_Init() {
$fhem_dbh->do("CREATE TABLE IF NOT EXISTS fhembinfilesave(filename TEXT, content BLOB)");
}
$fhem_dbh->commit();
# check if we need to move files from text to binary
my $needmove;
if($cfgDB_dbtype eq "SQLITE") {
$needmove = $fhem_dbh->selectrow_array( "SELECT count(1) FROM sqlite_master WHERE name='fhemfilesave'" );
}
if($cfgDB_dbtype eq "MYSQL") {
my $result = $fhem_dbh->do("SHOW TABLES LIKE 'fhemfilesave'");
$needmove = ($result > 0) ? 1 : 0;
}
if($cfgDB_dbtype eq "POSTGRESQL") {
$needmove = $fhem_dbh->selectrow_array("SELECT count(1) from pg_catalog.pg.tables where tablename = 'fhemfilesave'");
}
# close database connection
# close database connection
$fhem_dbh->commit();
$fhem_dbh->disconnect();
# move all files from text filesave to binary if not already done
_cfgDB_Move if($needmove);
return;
}
@ -356,10 +335,21 @@ sub cfgDB_FileUpdate($) {
sub cfgDB_ReadAll($) {
my ($cl) = @_;
my ($ret, @dbconfig);
# add Config Rows to commandfile
@dbconfig = _cfgDB_ReadCfg(@dbconfig);
# add State Rows to commandfile
@dbconfig = _cfgDB_ReadState(@dbconfig) unless $configDB{attr}{nostate};
if ($configDB{attr}{rescue} == 1) {
Log (0, 'configDB starting in rescue mode!');
push (@dbconfig, 'attr global modpath .');
push (@dbconfig, 'attr global verbose 3');
push (@dbconfig, 'define telnetPort telnet 7072 global');
push (@dbconfig, 'define WEB FHEMWEB 8083 global');
push (@dbconfig, 'define Logfile FileLog ./log/fhem-%Y-%m-%d.log fakelog');
} else {
# add Config Rows to commandfile
@dbconfig = _cfgDB_ReadCfg(@dbconfig);
# add State Rows to commandfile
@dbconfig = _cfgDB_ReadState(@dbconfig) unless $configDB{attr}{nostate};
}
# AnalyzeCommandChain for all entries
$ret = _cfgDB_Execute($cl, @dbconfig);
return $ret if($ret);