From d5327a077bd75c6e3d53c63445304567e90efb42 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Sat, 14 Aug 2021 09:49:09 +0000 Subject: [PATCH] 92_FileLog.pm: prefer REGEXP eq NAME over fakelog (Forum #122372) git-svn-id: https://svn.fhem.de/fhem/trunk@24849 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/92_FileLog.pm | 8 +++++--- fhem/fhem.cfg | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm index ff169769a..a118a9108 100644 --- a/fhem/FHEM/92_FileLog.pm +++ b/fhem/FHEM/92_FileLog.pm @@ -416,11 +416,12 @@ FileLog_Set($@) my ($hash, @a) = @_; my $me = $hash->{NAME}; - return undef if( $hash->{REGEXP} eq 'fakelog' ); - return "no set argument specified" if(int(@a) < 2); my %sets = (reopen=>0, clear=>0, absorb=>1, addRegexpPart=>2, removeRegexpPart=>1); + %sets = (clear=>0) # 95351 + if($hash->{REGEXP} eq 'fakelog' || # deprecated + $hash->{REGEXP} eq $me); # 122373 my $cmd = $a[1]; if(!defined($sets{$cmd})) { @@ -558,7 +559,8 @@ FileLog_fhemwebFn($$$$) } $ret .= ""; return $ret if($pageHash); - return $ret if( $defs{$d}{REGEXP} eq 'fakelog' ); + return $ret if($defs{$d}{REGEXP} eq 'fakelog'); # deprecated + return $ret if($defs{$d}{REGEXP} eq $d); # DETAIL only from here on my $hash = $defs{$d}; diff --git a/fhem/fhem.cfg b/fhem/fhem.cfg index b23d34fae..b009df62a 100644 --- a/fhem/fhem.cfg +++ b/fhem/fhem.cfg @@ -6,7 +6,7 @@ attr global statefile ./log/fhem.save define WEB FHEMWEB 8083 global # Fake FileLog entry, to access the fhem log from FHEMWEB -define Logfile FileLog ./log/fhem-%Y-%m.log fakelog +define Logfile FileLog ./log/fhem-%Y-%m.log Logfile define autocreate autocreate attr autocreate filelog ./log/%NAME-%Y.log