FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

configDB.pm: exclude some devices on startup

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26227 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2022-07-14 16:34:31 +00:00
parent a6e99ea841
commit 6f35311962
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/configDB.pm
View File

@ -298,6 +298,7 @@ if($cfgDB_dbconn =~ m/pg:/i) {
} }
$configDB{type} = $cfgDB_dbtype; $configDB{type} = $cfgDB_dbtype;
$configDB{exclude} = defined($dbconfig{exclude}) ? $dbconfig{exclude} : '';
$configDB{attr}{nostate} = defined($dbconfig{nostate}) ? $dbconfig{nostate} : 0; $configDB{attr}{nostate} = defined($dbconfig{nostate}) ? $dbconfig{nostate} : 0;
$configDB{attr}{rescue} = defined($dbconfig{rescue}) ? $dbconfig{rescue} : 0; $configDB{attr}{rescue} = defined($dbconfig{rescue}) ? $dbconfig{rescue} : 0;
$configDB{attr}{loadversion} = defined($dbconfig{loadversion}) ? $dbconfig{loadversion} : 0; $configDB{attr}{loadversion} = defined($dbconfig{loadversion}) ? $dbconfig{loadversion} : 0;
@ -323,7 +324,7 @@ sub cfgDB_Init {
my $fhem_dbh = _cfgDB_Connect; my $fhem_dbh = _cfgDB_Connect;
# create TABLE fhemversions ifnonexistent # create TABLE fhemversions ifnonexistent
$fhem_dbh->do("CREATE TABLE IF NOT EXISTS fhemversions(VERSION INT, VERSIONUUID CHAR(50))"); $fhem_dbh->do("CREATE TABLE IF NOT EXISTS fhemversions(VERSION INT, VERSIONUUID CHAR(50), VERSIONTAG CHAR(50))");
# create TABLE fhemconfig if nonexistent # create TABLE fhemconfig if nonexistent
$fhem_dbh->do("CREATE TABLE IF NOT EXISTS fhemconfig(COMMAND VARCHAR(32), DEVICE VARCHAR(64), P1 VARCHAR(64), P2 TEXT, VERSION INT, VERSIONUUID CHAR(50))"); $fhem_dbh->do("CREATE TABLE IF NOT EXISTS fhemconfig(COMMAND VARCHAR(32), DEVICE VARCHAR(64), P1 VARCHAR(64), P2 TEXT, VERSION INT, VERSIONUUID CHAR(50))");
@ -363,6 +364,10 @@ sub cfgDB_Init {
$fhem_dbh->do("CREATE TABLE IF NOT EXISTS fhemb64filesave(filename TEXT, content BLOB)"); $fhem_dbh->do("CREATE TABLE IF NOT EXISTS fhemb64filesave(filename TEXT, content BLOB)");
} }
# modify table for version tags if needed
eval {$fhem_dbh->do("SELECT versiontag from fhemversions where version = 0")};
$fhem_dbh->do("ALTER TABLE fhemversions ADD VERSIONTAG char(50)") if $@;
# close database connection # close database connection
$fhem_dbh->commit(); $fhem_dbh->commit();
$fhem_dbh->disconnect(); $fhem_dbh->disconnect();
@ -789,13 +794,19 @@ sub _cfgDB_ReadCfg {
$uuid =~ s/^\s+|\s+$//g; $uuid =~ s/^\s+|\s+$//g;
$configDB{loaded} = $uuid; $configDB{loaded} = $uuid;
Log 4, "configDB read config ".$configDB{loaded}; Log 4, "configDB read config ".$configDB{loaded};
my @excluded = split(/,/,$configDB{exclude});
map { s/^\s+|\s+$//g; } @excluded;
$sth = $fhem_dbh->prepare( "SELECT * FROM fhemconfig WHERE versionuuid = '$uuid' and device <>'configdb' order by version" ); $sth = $fhem_dbh->prepare( "SELECT * FROM fhemconfig WHERE versionuuid = '$uuid' and device <>'configdb' order by version" );
$sth->execute(); $sth->execute();
while (@line = $sth->fetchrow_array()) { while (@line = $sth->fetchrow_array()) {
$row = "$line[0] $line[1] $line[2]"; $row = "$line[0] $line[1] $line[2]";
$row .= " $line[3]" if defined($line[3]); $row .= " $line[3]" if defined($line[3]);
push @dbconfig, $row; if ( grep( /^$line[1]$/, @excluded ) ) {
Log 1, "configDB excluding $line[1] ($row)" if $line[0] eq "define";
} else {
push @dbconfig, $row;
}
} }
$fhem_dbh->disconnect(); $fhem_dbh->disconnect();
return @dbconfig; return @dbconfig;
@ -844,7 +855,7 @@ sub _cfgDB_Rotate {
delete $data{saveID}; # no longer needed in memory delete $data{saveID}; # no longer needed in memory
$configDB{loaded} = $uuid; $configDB{loaded} = $uuid;
$fhem_dbh->do("UPDATE fhemversions SET VERSION = VERSION+1 where VERSION >= 0") if $newversion == 0; $fhem_dbh->do("UPDATE fhemversions SET VERSION = VERSION+1 where VERSION >= 0") if $newversion == 0;
$fhem_dbh->do("INSERT INTO fhemversions values ('$newversion', '$uuid')"); $fhem_dbh->do("INSERT INTO fhemversions values ('$newversion', '$uuid', NULL)");
return $uuid; return $uuid;
} }
@ -955,6 +966,7 @@ sub _cfgDB_Info {
$fhem_dbh->selectrow_array("SELECT COUNT(*) from fhemconfig where COMMAND = 'define' and VERSIONUUID = '$line[5]'"); $fhem_dbh->selectrow_array("SELECT COUNT(*) from fhemconfig where COMMAND = 'define' and VERSIONUUID = '$line[5]'");
$row .= " attr: ". $row .= " attr: ".
$fhem_dbh->selectrow_array("SELECT COUNT(*) from fhemconfig where COMMAND = 'attr' and VERSIONUUID = '$line[5]'"); $fhem_dbh->selectrow_array("SELECT COUNT(*) from fhemconfig where COMMAND = 'attr' and VERSIONUUID = '$line[5]'");
$row .= " tag: ".$line[8] if $line[8];
push @r, $row; push @r, $row;
} }
push @r, $l; push @r, $l;