2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 08:11:44 +00:00

93_DbLog: contrib 5.8.7

git-svn-id: https://svn.fhem.de/fhem/trunk@27501 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2023-05-01 06:36:36 +00:00
parent 766969cafe
commit 554a7e074a

View File

@ -38,7 +38,7 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch';
# Version History intern by DS_Starter: # Version History intern by DS_Starter:
my %DbLog_vNotesIntern = ( my %DbLog_vNotesIntern = (
"5.8.7" => "30.04.2023 new Events INITIALIZED, DISCONNECTED ", "5.8.7" => "01.05.2023 new Events FRAME_INITIALIZED, SUBPROC_INITIALIZED, SUBPROC_DISCONNECTED, SUBPROC_STOPPED ",
"5.8.6" => "25.03.2023 change _DbLog_plotData (intx), Plot Editor: include functions delta-h, delta-h, ...". "5.8.6" => "25.03.2023 change _DbLog_plotData (intx), Plot Editor: include functions delta-h, delta-h, ...".
"remove setter deleteOldDaysNbl, reduceLogNbl ", "remove setter deleteOldDaysNbl, reduceLogNbl ",
"5.8.5" => "16.03.2023 fix using https in configCheck after SVN server change ", "5.8.5" => "16.03.2023 fix using https in configCheck after SVN server change ",
@ -316,13 +316,11 @@ sub _DbLog_initOnStart {
DbLog_setSchemeTable ($hash); DbLog_setSchemeTable ($hash);
notifyRegexpChanged ($hash, $hash->{REGEXP}); # nur Events dieser Devices an NotifyFn weiterleiten, NOTIFYDEV wird gesetzt wenn möglich notifyRegexpChanged ($hash, $hash->{REGEXP}); # nur Events dieser Devices an NotifyFn weiterleiten, NOTIFYDEV wird gesetzt wenn möglich
DoTrigger ($name, 'FRAME_INITIALIZED', 1);
DbLog_SBP_CheckAndInit ($hash); DbLog_SBP_CheckAndInit ($hash);
DbLog_SBP_sendConnectionData ($hash); # Verbindungsdaten an SubProzess senden
my $rst = DbLog_SBP_sendConnectionData ($hash); # Verbindungsdaten an SubProzess senden
if (!$rst) {
Log3 ($name, 3, "DbLog $name - DB connection parameters are initialized in the SubProcess");
}
DbLog_execMemCacheAsync ($hash); # InternalTimer DbLog_execMemCacheAsync starten DbLog_execMemCacheAsync ($hash); # InternalTimer DbLog_execMemCacheAsync starten
return; return;
@ -5384,7 +5382,7 @@ sub DbLog_SBP_CleanUp {
#$subprocess->wait(); #$subprocess->wait();
kill 'SIGKILL', $pid; kill 'SIGKILL', $pid;
waitpid($pid, 0); waitpid ($pid, 0);
Log3 ($name, 2, qq{DbLog $name - SubProcess PID >$pid< stopped}); Log3 ($name, 2, qq{DbLog $name - SubProcess PID >$pid< stopped});
@ -5395,6 +5393,8 @@ sub DbLog_SBP_CleanUp {
$hash->{SBP_STATE} = "Stopped"; $hash->{SBP_STATE} = "Stopped";
DoTrigger ($name, 'SUBPROC_STOPPED', 1);
return; return;
} }
@ -5503,13 +5503,15 @@ sub DbLog_SBP_Read {
## sendDbConnectData - Read ## sendDbConnectData - Read
############################# #############################
if ($oper =~ /sendDbConnectData/xs) { if ($oper =~ /sendDbConnectData/xs) {
DoTrigger ($name, 'INITIALIZED', 1); Log3 ($name, 3, "DbLog $name - DB connection parameters are initialized in the SubProcess");
DoTrigger ($name, 'SUBPROC_INITIALIZED', 1);
} }
## dbDisconnect - Read ## dbDisconnect - Read
######################## ########################
if ($oper =~ /dbDisconnect/xs) { if ($oper =~ /dbDisconnect/xs) {
DoTrigger ($name, 'DISCONNECTED', 1); DoTrigger ($name, 'SUBPROC_DISCONNECTED', 1);
} }
if(AttrVal($name, 'showproctime', 0) && $ot) { if(AttrVal($name, 'showproctime', 0) && $ot) {