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

MQTT2_SERVER: revert ignoreRegexp changes (Forum #26742)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26751 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2022-11-26 16:38:56 +00:00
parent 3259faa600
commit 3a1fa16942
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/00_MQTT2_SERVER.pm
View File

@ -541,10 +541,7 @@ MQTT2_SERVER_doPublish($$$$;$)
$val = "" if(!defined($val)); $val = "" if(!defined($val));
$src = $server if(!defined($src)); $src = $server if(!defined($src));
my $now = gettimeofday(); my $now = gettimeofday();
my $serverName = $server->{NAME}; my $serverName = $server->{NAME};
my $ir = AttrVal($serverName, "ignoreRegexp", undef);
return if(defined($ir) && "$tp:$val" =~ m/$ir/);
if($retain && AttrVal($serverName, "respectRetain", $featurelevel <= 6.1)) { if($retain && AttrVal($serverName, "respectRetain", $featurelevel <= 6.1)) {
if(!defined($val) || $val eq "") { if(!defined($val) || $val eq "") {
@ -566,6 +563,9 @@ MQTT2_SERVER_doPublish($$$$;$)
MQTT2_SERVER_sendto($server, $defs{$clName}, $tp, $val); MQTT2_SERVER_sendto($server, $defs{$clName}, $tp, $val);
} }
my $ir = AttrVal($serverName, "ignoreRegexp", undef);
return if(defined($ir) && "$tp:$val" =~ m/$ir/);
my $cid = $src->{cid}; my $cid = $src->{cid};
$tp =~ s/:/_/g if(AttrVal($serverName, "topicConversion", 1)); # 96608 $tp =~ s/:/_/g if(AttrVal($serverName, "topicConversion", 1)); # 96608
if(defined($cid) || # "real" MQTT client if(defined($cid) || # "real" MQTT client
@ -874,10 +874,7 @@ MQTT2_SERVER_ReadDebug($$)
<a id="MQTT2_SERVER-attr-ignoreRegexp"></a> <a id="MQTT2_SERVER-attr-ignoreRegexp"></a>
<li>ignoreRegexp<br> <li>ignoreRegexp<br>
if $topic:$message matches ignoreRegexp, then it will be silently if $topic:$message matches ignoreRegexp, then it will be silently ignored.
ignored. Such messages are not distributed to connected MQTT clients,
are not stored (if retain is set), and are not dispatched in FHEM for
further processing.
</li> </li>
<a id="MQTT2_SERVER-attr-keepaliveFactor"></a> <a id="MQTT2_SERVER-attr-keepaliveFactor"></a>