FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-03 13:45:36 +00:00
Code Issues Releases Wiki Activity

fhem.pl: add Logdir(), and use it in FHEMWEB.pm (Forum #108865)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21337 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2020-03-02 16:42:53 +00:00
parent 29b9a673fb
commit a4c2da3cad
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/01_FHEMWEB.pm
View File

@ -2114,8 +2114,8 @@ sub
FW_fileList($;$) FW_fileList($;$)
{ {
my ($fname,$mtime) = @_; my ($fname,$mtime) = @_;
$fname =~ s/%L/$attr{global}{logdir}/g #Forum #89744 my $logdir = Logdir();
if($fname =~ m/%/ && $attr{global}{logdir}); $fname =~ s/%L/$logdir/g; #Forum #89744
$fname =~ m,^(.*)/([^/]*)$,; # Split into dir and file $fname =~ m,^(.*)/([^/]*)$,; # Split into dir and file
my ($dir,$re) = ($1, $2); my ($dir,$re) = ($1, $2);
return $fname if(!$re); return $fname if(!$re);
@ -2336,7 +2336,7 @@ FW_fileNameToPath($)
} elsif($name =~ m/.*gplot$/) { } elsif($name =~ m/.*gplot$/) {
return "$FW_gplotdir/$name"; return "$FW_gplotdir/$name";
} elsif($name =~ m/.*log$/) { } elsif($name =~ m/.*log$/) {
return AttrVal("global", "logdir", "log")."/$name"; return Logdir()."/$name";
} else { } else {
return "$MW_dir/$name"; return "$MW_dir/$name";
} }

9
fhem/fhem.pl
View File

@ -3485,6 +3485,12 @@ FmtDateTimeRFC1123($)
} }
sub
Logdir()
{
return AttrVal("global","logdir", AttrVal("global","modpath","")."/log");
}
##################################### #####################################
sub sub
ResolveDateWildcards($@) ResolveDateWildcards($@)
@ -3494,8 +3500,7 @@ ResolveDateWildcards($@)
my ($f, @t) = @_; my ($f, @t) = @_;
return $f if(!$f); return $f if(!$f);
return $f if($f !~ m/%/); # Be fast if there is no wildcard return $f if($f !~ m/%/); # Be fast if there is no wildcard
my $logdir = AttrVal("global","logdir", my $logdir = Logdir();
AttrVal("global","modpath","")."/log");
$f =~ s/%L/$logdir/g; $f =~ s/%L/$logdir/g;
return strftime($f,@t); return strftime($f,@t);
} }