From 0814b367209a1111c853d3a7d66cd74d8467d2f8 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Mon, 22 Oct 2018 19:25:46 +0000 Subject: [PATCH] 93_DbLog: timer not deleted if reopen after reopen xxx executed git-svn-id: https://svn.fhem.de/fhem/trunk@17599 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 2 ++ fhem/FHEM/93_DbLog.pm | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index f887599c7..ccc4eb88d 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # 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. + - bugfix: 93_DbLog: timer not deleted if reopen after reopen xxx executed + (forum.fhem.de/index.php/topic,91869.msg848433.html#msg848433) - feature: 70_ZoneMinder: added attribute loginInterval and setter for login - bugfix: 38_netatmo: changed connection check mechanism - new: 98_SmarterCoffee: new modul for SmarterCoffee devices diff --git a/fhem/FHEM/93_DbLog.pm b/fhem/FHEM/93_DbLog.pm index d0de95183..0d1e5d725 100644 --- a/fhem/FHEM/93_DbLog.pm +++ b/fhem/FHEM/93_DbLog.pm @@ -16,6 +16,7 @@ ############################################################################################################################################ # Versions History done by DS_Starter & DeeSPe: # +# 3.12.6 22.10.2018 fix timer not deleted if reopen after reopen xxx (Forum: https://forum.fhem.de/index.php/topic,91869.msg848433.html#msg848433) # 3.12.5 12.10.2018 charFilter: "\xB0C" substitution by "°C" added and usage in DbLog_Log changed # 3.12.4 10.10.2018 return non-saved datasets back in asynch mode only if transaction is used # 3.12.3 08.10.2018 Log output of recuceLogNbl enhanced, some functions renamed @@ -214,7 +215,7 @@ use Time::Local; use Encode qw(encode_utf8); no if $] >= 5.017011, warnings => 'experimental::smartmatch'; -my $DbLogVersion = "3.12.5"; +my $DbLogVersion = "3.12.6"; my %columns = ("DEVICE" => 64, "TYPE" => 64, @@ -593,7 +594,7 @@ sub DbLog_Set($@) { if($hash->{HELPER}{REOPEN_RUNS}) { delete $hash->{HELPER}{REOPEN_RUNS}; delete $hash->{HELPER}{REOPEN_RUNS_UNTIL}; - RemoveInternalTimer($hash, "reopen"); + RemoveInternalTimer($hash, "DbLog_reopen"); } DbLog_execmemcache($hash) if($async); $ret = "Reopen executed.";