mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid error messages in the log in some strange situations

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@390 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2009-06-12 09:42:37 +00:00
parent be62222603
commit 59b33be4a6
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/fhem.pl
View File

@@ -151,7 +151,7 @@ my %defaultattr; # Default attributes
my %intAt; # Internal at timer hash. my %intAt; # Internal at timer hash.
my $nextat; # Time when next timer will be triggered. my $nextat; # Time when next timer will be triggered.
my $intAtCnt=0; my $intAtCnt=0;
my $cvsid = '$Id: fhem.pl,v 1.72 2009-05-30 15:11:56 rudolfkoenig Exp $'; my $cvsid = '$Id: fhem.pl,v 1.73 2009-06-12 09:42:37 rudolfkoenig Exp $';
my $namedef = my $namedef =
"where <name> is either:\n" . "where <name> is either:\n" .
"- a single device name\n" . "- a single device name\n" .
@@ -633,16 +633,18 @@ devspec2array($)
next; next;
} }
my $regok;
eval { # a bad regexp may shut down fhem.pl eval { # a bad regexp may shut down fhem.pl
if($l =~ m/[*\[\]^\$]/) { # Regexp if($l =~ m/[*\[\]^\$]/) { # Regexp
push @ret, grep($_ =~ m/$l/, sort keys %defs); push @ret, grep($_ =~ m/$l/, sort keys %defs);
next; $regok = 1;
} }
}; };
if($@) { if($@) {
Log 1, "devspec2array $name: $@"; Log 1, "devspec2array $name: $@";
return $name; return $name;
} }
next if($regok);
if($l =~ m/-/) { # Range if($l =~ m/-/) { # Range
my ($lower, $upper) = split("-", $l, 2); my ($lower, $upper) = split("-", $l, 2);
@@ -1849,7 +1851,8 @@ DoTrigger($$)
if(defined($modules{$defs{$n}{TYPE}})) { if(defined($modules{$defs{$n}{TYPE}})) {
if($modules{$defs{$n}{TYPE}}{NotifyFn}) { if($modules{$defs{$n}{TYPE}}{NotifyFn}) {
Log 5, "$dev trigger: Checking $n for notify"; Log 5, "$dev trigger: Checking $n for notify";
$ret .= CallFn($n, "NotifyFn", $defs{$n}, $defs{$dev}); my $r = CallFn($n, "NotifyFn", $defs{$n}, $defs{$dev});
$ret .= $r if($r);
} }
} }
} }