From 4a2f45bef6dd3ccf7b8c276a4b565a0185082277 Mon Sep 17 00:00:00 2001 From: dev0 Date: Thu, 21 Dec 2017 12:47:50 +0000 Subject: [PATCH] 34_ESPEasy.pm: add source/target device to verbose 4 logging (Forum #71418) git-svn-id: https://svn.fhem.de/fhem/trunk@15662 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/34_ESPEasy.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/34_ESPEasy.pm b/fhem/FHEM/34_ESPEasy.pm index 71e84a32a..798f191b0 100644 --- a/fhem/FHEM/34_ESPEasy.pm +++ b/fhem/FHEM/34_ESPEasy.pm @@ -760,9 +760,15 @@ sub ESPEasy_Read($) { return; } - my $ident = ESPEasy_isCombineDevices($peer,$espName,AttrVal($bname,"combineDevices",0)) + my $cd = ESPEasy_isCombineDevices($peer,$espName,AttrVal($bname,"combineDevices",0)); + my $ident = $cd ? $espName ne "" ? $espName : $peer : $espName.($espName ne "" && $espDevName ne "" ? "_" : "").$espDevName; + Log3 $bname, 4, "$btype $name: " + . "Dispatch to: '$ident', " + . "source: '$json->{data}{ESP}{name}'/" + . "'$json->{data}{SENSOR}{0}{deviceName}' " + . "(combinedDevice: ".($cd ? "true" : "false").")"; # push internals in @values my @values; @@ -1155,7 +1161,7 @@ sub ESPEasy_dispatch($$$@) #called by bridge -> send to logical devices my $ac = (AttrVal($bname,"autocreate",AttrVal("global","autoload_undefined_devices",1))) ? 1 : 0; my $msg = $ident."::".$host."::".$ac."::".$as."::".$ui."::".join("|||",@values); - Log3 $bname, 5, "$type $name: Dispatch: $msg"; +# Log3 $bname, 5, "$type $name: Dispatch: $msg"; Dispatch($bhash, $msg, undef); return undef;