From 897e50e948af352203b7fa9309a454d000285c27 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sun, 3 Dec 2017 20:01:46 +0000 Subject: [PATCH] 92_FileLog.pm: remove newline from the data (Forum #79684) git-svn-id: https://svn.fhem.de/fhem/trunk@15548 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/92_FileLog.pm | 3 +++ 2 files changed, 4 insertions(+) diff --git a/fhem/CHANGED b/fhem/CHANGED index a3056baf5..d74b1a2b4 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - change: FileLog removes newlines from the data (Forum #79684) - bugfix: 98_Siro.pm: Support favorit for model ERB15LE - feature: notify/FileLog: add ignoreRegexp attribute (Forum #79684) - feature: 46_SmartPi: add decimal Attr, fix Notify bug diff --git a/fhem/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm index 9ec4f0758..154e2a4a1 100644 --- a/fhem/FHEM/92_FileLog.pm +++ b/fhem/FHEM/92_FileLog.pm @@ -207,6 +207,7 @@ FileLog_Log($$) $switched = 1; } $fh = $log->{FH}; + $s =~ s/\n/ /g; print $fh "$t $n $s\n"; $written++; } @@ -274,6 +275,8 @@ FileLog_Set($@) my $r = "Unknown argument $cmd, choose one of ".join(" ",sort keys %sets); my $fllist = join(",", grep { $me ne $_ } devspec2array("TYPE=FileLog")); $r =~ s/absorb/absorb:$fllist/; + $r =~ s/clear/clear:noArg/; + $r =~ s/reopen/reopen:noArg/; return $r; } return "$cmd needs $sets{$cmd} parameter(s)" if(@a-$sets{$cmd} != 2);