diff --git a/fhem/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm index 39fc2f632..7fe940bb0 100755 --- a/fhem/FHEM/92_FileLog.pm +++ b/fhem/FHEM/92_FileLog.pm @@ -47,7 +47,7 @@ FileLog_Initialize($) $data{FWEXT}{"/FileLog_logWrapper"}{CONTENTFUNC} = "FileLog_logWrapper"; InternalTimer(time()+0.1, sub() { # Forum #39792 - map { HandleArchiving($defs{$_}) } devspec2array("TYPE=FileLog"); + map { HandleArchiving($defs{$_},1) } devspec2array("TYPE=FileLog"); }, $hash, 0); } diff --git a/fhem/fhem.pl b/fhem/fhem.pl index c84c25046..e2d53baf9 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -61,7 +61,7 @@ sub FmtTime($); sub GetLogLevel(@); sub GetTimeSpec($); sub GlobalAttr($$$$); -sub HandleArchiving($); +sub HandleArchiving($;$); sub HandleTimeout(); sub IOWrite($@); sub InternalTimer($$$$); @@ -3104,9 +3104,9 @@ myrename($$) ##################################### # Make a directory and its parent directories if needed. sub -HandleArchiving($) +HandleArchiving($;$) { - my ($log) = @_; + my ($log,$diff) = @_; my $ln = $log->{NAME}; return if(!$attr{$ln}); @@ -3139,6 +3139,7 @@ HandleArchiving($) closedir(DH); my $max = int(@files)-$nra; + $max -= $diff if($diff); for(my $i = 0; $i < $max; $i++) { if($ard) { Log 2, "Moving $files[$i] to $ard"; diff --git a/fhem/www/pgm2/svg.js b/fhem/www/pgm2/svg.js index 456208915..340de2c5b 100644 --- a/fhem/www/pgm2/svg.js +++ b/fhem/www/pgm2/svg.js @@ -314,7 +314,7 @@ svg_init(par) // also called directly from perl, in race condition var ed = e.getSVGDocument(); if(src.indexOf("SVG_showLog") < 0 || !ed) return; - var sTag = $("svg", ed)[0]; + var sTag = $("svg", ed)[0]; // "not well-formed" warning in FireFox if((par && $(sTag).attr("id") != par)) return; svg_init_one(e, sTag);