mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

93_DbLog: contrib 5.5.1

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26823 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
DS_Starter
2022-12-09 20:15:55 +00:00
parent fb14be6f71
commit 9570311acf
1 changed files with 24 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
fhem/contrib/DS_Starter/93_DbLog.pm
View File

@@ -2254,7 +2254,7 @@ sub DbLog_SBP_onRun {
my $msg0 = $dbdelpars ? ' and stored DB params in SubProcess were deleted' : ''; my $msg0 = $dbdelpars ? ' and stored DB params in SubProcess were deleted' : '';
my $msg1 = 'database disconnected by request'.$msg0; my $msg1 = 'database disconnected by request'.$msg0;
Log3 ($name, 3, "DbLog $name - INFO: $msg1"); Log3 ($name, 3, "DbLog $name - $msg1");
$ret = { $ret = {
name => $name, name => $name,
@@ -2331,18 +2331,20 @@ sub DbLog_SBP_onRun {
## Verbindungsaufbau Datenbank ## Verbindungsaufbau Datenbank
################################ ################################
my $params = { name => $name,
dbconn => $dbconn,
dbname => $store->{dbparams}{dbname},
dbuser => $store->{dbparams}{dbuser},
dbpassword => $store->{dbparams}{dbpassword},
utf8 => $store->{dbparams}{utf8},
useac => $useac,
model => $model,
sltjm => $store->{dbparams}{sltjm},
sltcs => $store->{dbparams}{sltcs}
};
if (!defined $store->{dbh}) { if (!defined $store->{dbh}) {
($error, $dbh) = _DbLog_SBP_onRun_connectDB ( { name => $name, ($error, $dbh) = _DbLog_SBP_onRun_connectDB ($params);
dbconn => $dbconn,
dbuser => $store->{dbparams}{dbuser},
dbpassword => $store->{dbparams}{dbpassword},
utf8 => $store->{dbparams}{utf8},
useac => $useac,
model => $model,
sltjm => $store->{dbparams}{sltjm},
sltcs => $store->{dbparams}{sltcs}
}
);
if ($error) { if ($error) {
Log3 ($name, 2, "DbLog $name - Error: $error"); Log3 ($name, 2, "DbLog $name - Error: $error");
@@ -2372,17 +2374,7 @@ sub DbLog_SBP_onRun {
Log3 ($name, 4, "DbLog $name - Database Connection dead. Try reconnect ..."); Log3 ($name, 4, "DbLog $name - Database Connection dead. Try reconnect ...");
delete $store->{dbh}; delete $store->{dbh};
($error, $dbh) = _DbLog_SBP_onRun_connectDB ( { name => $name, ($error, $dbh) = _DbLog_SBP_onRun_connectDB ($params);
dbconn => $dbconn,
dbuser => $store->{dbparams}{dbuser},
dbpassword => $store->{dbparams}{dbpassword},
utf8 => $store->{dbparams}{utf8},
useac => $useac,
model => $model,
sltjm => $store->{dbparams}{sltjm},
sltcs => $store->{dbparams}{sltcs}
}
);
if ($error) { if ($error) {
Log3 ($name, 2, "DbLog $name - Error: $error"); Log3 ($name, 2, "DbLog $name - Error: $error");
@@ -2552,6 +2544,8 @@ sub _DbLog_SBP_onRun_connectDB {
$dbh->do("PRAGMA journal_mode=$sltjm"); $dbh->do("PRAGMA journal_mode=$sltjm");
$dbh->do("PRAGMA cache_size=$sltcs"); $dbh->do("PRAGMA cache_size=$sltcs");
} }
Log3 ($name, 3, "DbLog $name - SubProcess connected to $paref->{dbname}");
return ($err, $dbh); return ($err, $dbh);
} }
@@ -2952,12 +2946,6 @@ sub _DbLog_SBP_onRun_Log {
} }
} }
1; 1;
# $error = __DbLog_SBP_commitOnly ($name, $dbh, $history);
#if ($error) {
# $rowlback = $cdata if($useta); # nicht gespeicherte Datensätze nur zurück geben wenn Transaktion ein
#}
} }
or do { $error = $@; or do { $error = $@;
@@ -6807,20 +6795,15 @@ sub DbLog_reopen {
RemoveInternalTimer($hash, "DbLog_reopen"); RemoveInternalTimer($hash, "DbLog_reopen");
if (_DbLog_ConnectPush($hash)) { my $delay = delete $hash->{HELPER}{REOPEN_RUNS}; # Statusbit "Kein Schreiben in DB erlauben" löschen
my $delay = delete $hash->{HELPER}{REOPEN_RUNS}; # Statusbit "Kein Schreiben in DB erlauben" löschen delete $hash->{HELPER}{REOPEN_RUNS_UNTIL};
delete $hash->{HELPER}{REOPEN_RUNS_UNTIL};
if($delay) { if($delay) {
Log3 ($name, 2, "DbLog $name - Database connection reopened (it was $delay seconds closed)."); Log3 ($name, 2, "DbLog $name - Database connection reopened (it was $delay seconds closed).");
} }
DbLog_setReadingstate ($hash, 'reopened'); DbLog_setReadingstate ($hash, 'reopened');
DbLog_execMemCacheAsync ($hash) if($async); DbLog_execMemCacheAsync ($hash) if($async);
}
else {
InternalTimer(gettimeofday()+30, 'DbLog_reopen', $hash, 0);
}
return; return;
} }