From 88a5b3b125b4f6919f75baeb730d6f361fae18ee Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Mon, 17 Jan 2022 15:15:12 +0000 Subject: [PATCH] 93_DbLog: change log message deprecated to outdated git-svn-id: https://svn.fhem.de/fhem/trunk@25478 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/93_DbLog.pm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/fhem/FHEM/93_DbLog.pm b/fhem/FHEM/93_DbLog.pm index de8750559..b6b285bd9 100644 --- a/fhem/FHEM/93_DbLog.pm +++ b/fhem/FHEM/93_DbLog.pm @@ -8,7 +8,7 @@ # modified and maintained by Tobias Faust since 2012-06-26 until 2016 # e-mail: tobias dot faust at online dot de # -# redesigned and maintained 2016-2021 by DS_Starter with credits by: JoeAllb, DeeSpe +# redesigned and maintained 2016-2022 by DS_Starter with credits by: JoeAllb, DeeSpe # e-mail: heiko dot maaz at t-online dot de # # reduceLog() created by Claudiu Schuster (rapster) @@ -30,7 +30,8 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch'; # Version History intern by DS_Starter: my %DbLog_vNotesIntern = ( - "4.12.5" => "31.12.2001 standard unit assignment for readings beginning with 'temperature' and removed, forum:#125087 ", + "4.12.6" => "17.01.2022 change log message deprecated to outdated, forum:#topic,41089.msg1201261.html#msg1201261 ", + "4.12.5" => "31.12.2021 standard unit assignment for readings beginning with 'temperature' and removed, forum:#125087 ", "4.12.4" => "27.12.2021 change ParseEvent for FBDECT, warning messages for deprecated commands added ", "4.12.3" => "20.04.2021 change sub DbLog_ConnectNewDBH for SQLITE, change error Logging in DbLog_writeFileIfCacheOverflow ", "4.12.2" => "08.04.2021 change standard splitting ", @@ -660,7 +661,7 @@ sub DbLog_Set { my $ret; if ($a[1] eq 'reduceLog') { - Log3($name, 2, qq{DbLog $name - WARNING - "$a[1]" is deprecated. Please use DbRep "set reduceLog" instead.}); + Log3($name, 2, qq{DbLog $name - WARNING - "$a[1]" is outdated. Please consider use of DbRep "set reduceLog" instead.}); my ($od,$nd) = split(":",$a[2]); # $od - Tage älter als , $nd - Tage neuer als if ($nd && $nd <= $od) {return "The second day value must be greater than the first one ! ";} if (defined($a[3]) && $a[3] !~ /^average$|^average=.+|^EXCLUDE=.+$|^INCLUDE=.+$/i) { @@ -676,7 +677,7 @@ sub DbLog_Set { } } elsif ($a[1] eq 'reduceLogNbl') { - Log3($name, 2, qq{DbLog $name - WARNING - "$a[1]" is deprecated. Please use DbRep "set reduceLog" instead.}); + Log3($name, 2, qq{DbLog $name - WARNING - "$a[1]" is outdated. Please consider use of DbRep "set reduceLog" instead.}); my ($od,$nd) = split(":",$a[2]); # $od - Tage älter als , $nd - Tage neuer als if ($nd && $nd <= $od) {return "The second day value must be greater than the first one ! ";} if (defined($a[3]) && $a[3] !~ /^average$|^average=.+|^EXCLUDE=.+$|^INCLUDE=.+$/i) { @@ -934,7 +935,7 @@ sub DbLog_Set { return; } elsif ($a[1] eq 'count') { - Log3($name, 2, qq{DbLog $name - WARNING - "$a[1]" is deprecated. Please use DbRep "set countEntries" instead.}); + Log3($name, 2, qq{DbLog $name - WARNING - "$a[1]" is outdated. Please consider use of DbRep "set countEntries" instead.}); $dbh = DbLog_ConnectNewDBH($hash); if(!$dbh) { @@ -953,7 +954,7 @@ sub DbLog_Set { } } elsif ($a[1] eq 'countNbl') { - Log3($name, 2, qq{DbLog $name - WARNING - "$a[1]" is deprecated. Please use DbRep "set countEntries" instead.}); + Log3($name, 2, qq{DbLog $name - WARNING - "$a[1]" is outdated. Please consider use of DbRep "set countEntries" instead.}); if ($hash->{HELPER}{COUNT_PID} && $hash->{HELPER}{COUNT_PID}{pid} !~ m/DEAD/){ $ret = "DbLog count already in progress. Please wait until the running process is finished."; } @@ -964,7 +965,7 @@ sub DbLog_Set { } } elsif ($a[1] eq 'deleteOldDays') { - Log3($name, 2, qq{DbLog $name - WARNING - "$a[1]" is deprecated. Please use DbRep "set delEntries" instead.}); + Log3($name, 2, qq{DbLog $name - WARNING - "$a[1]" is outdated. Please consider use of DbRep "set delEntries" instead.}); Log3 ($name, 3, "DbLog $name -> Deletion of records older than $a[2] days in database $db requested"); my ($c, $cmd); @@ -994,7 +995,7 @@ sub DbLog_Set { } } elsif ($a[1] eq 'deleteOldDaysNbl') { - Log3($name, 2, qq{DbLog $name - WARNING - "$a[1]" is deprecated. Please use DbRep "set delEntries" instead.}); + Log3($name, 2, qq{DbLog $name - WARNING - "$a[1]" is outdated. Please consider use of DbRep "set delEntries" instead.}); if (defined $a[2] && $a[2] =~ /^\d+$/) { if ($hash->{HELPER}{DELDAYS_PID} && $hash->{HELPER}{DELDAYS_PID}{pid} !~ m/DEAD/) { $ret = "deleteOldDaysNbl already in progress. Please wait until the running process is finished."; @@ -1012,7 +1013,7 @@ sub DbLog_Set { } } elsif ($a[1] eq 'userCommand') { - Log3($name, 2, qq{DbLog $name - WARNING - "$a[1]" is deprecated. Please use DbRep "set sqlCmd" instead.}); + Log3($name, 2, qq{DbLog $name - WARNING - "$a[1]" is outdated. Please consider use of DbRep "set sqlCmd" instead.}); $dbh = DbLog_ConnectNewDBH($hash); if(!$dbh) { Log3($name, 1, "DbLog $name: DBLog_Set - userCommand - DB connect not possible"); @@ -7040,7 +7041,7 @@ sub DbLog_showChildHandles { Performs simple sql select statements on the connected database. Usercommand and result will be written into corresponding readings.
The result can only be a single line. - The execution of SQL-Statements in DbLog is deprecated. Therefore the analysis module + The execution of SQL-Statements in DbLog is outdated. Therefore the analysis module DbRep should be used.

@@ -8445,7 +8446,7 @@ attr SMA_Energymeter DbLogValueFn Führt einfache sql select Befehle auf der Datenbank aus. Der Befehl und ein zurückgeliefertes Ergebnis wird in das Reading "userCommand" bzw. "userCommandResult" geschrieben. Das Ergebnis kann nur einzeilig sein. - Die Ausführung von SQL-Befehlen in DbLog sind deprecated. Dafür sollte das Auswertungsmodul + Die Ausführung von SQL-Befehlen in DbLog ist veraltet. Dafür sollte das Auswertungsmodul DbRep genutzt werden.