FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 20:24:36 +00:00
Code Issues Releases Wiki Activity

fhem.pl: rewrite ignoreRegexp code (Forum #107403)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21009 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2020-01-18 12:14:41 +00:00
parent b0827eaa29
commit d0722b8004
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/fhem.pl
View File

@ -4,8 +4,8 @@
# #
# Copyright notice # Copyright notice
# #
# (c) 2005-2019 # (c) 2005-2020
# Copyright: Rudolf Koenig (r dot koenig at koeniglich dot de) # Copyright: Rudolf Koenig (rudolf dot koenig at fhem dot de)
# All rights reserved # All rights reserved
# #
# This script free software; you can redistribute it and/or modify # This script free software; you can redistribute it and/or modify
@ -303,7 +303,6 @@ my @cmdList; # Remaining commands in a chain. Used by sleep
my %sleepers; # list of sleepers my %sleepers; # list of sleepers
my %delayedShutdowns; # definitions needing delayed shutdown my %delayedShutdowns; # definitions needing delayed shutdown
my %fuuidHash; # for duplicate checking my %fuuidHash; # for duplicate checking
my $ignoreRegexp; # for Log filtering
$init_done = 0; $init_done = 0;
$lastDefChange = 0; $lastDefChange = 0;
@ -971,7 +970,8 @@ Log3($$$)
return if($loglevel > $attr{global}{verbose}); return if($loglevel > $attr{global}{verbose});
} }
return if($ignoreRegexp && $text =~ m/^$ignoreRegexp$/); return if(defined($defs{global}{ignoreRegexpObj}) &&
$text =~ $defs{global}{ignoreRegexpObj});
my ($seconds, $microseconds) = gettimeofday(); my ($seconds, $microseconds) = gettimeofday();
my @t = localtime($seconds); my @t = localtime($seconds);
@ -2753,7 +2753,7 @@ GlobalAttr($$$$)
return "The global attribute $name cannot be deleted" if($noDel{$name}); return "The global attribute $name cannot be deleted" if($noDel{$name});
$featurelevel = 5.9 if($name eq "featurelevel"); $featurelevel = 5.9 if($name eq "featurelevel");
$haveInet6 = 0 if($name eq "useInet6"); # IPv6 $haveInet6 = 0 if($name eq "useInet6"); # IPv6
$ignoreRegexp = 0 if($name eq "ignoreRegexp"); delete($defs{global}{ignoreRegexpObj}) if($name eq "ignoreRegexp");
return undef; return undef;
} }
@ -2849,9 +2849,11 @@ GlobalAttr($$$$)
} }
} }
elsif($name eq "ignoreRegexp") { elsif($name eq "ignoreRegexp") {
eval { "Hallo" =~ m/^$val$/ }; return "Incorrect regexp (starts with *)" if($val =~ m/^\*/);
my $reObj;
eval { $reObj = qr/^$val$/; "Hallo" =~ $reObj ; };
return $@ if($@); return $@ if($@);
$ignoreRegexp = $val; $defs{global}{ignoreRegexpObj} = $reObj;
} }
return undef; return undef;