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

DevIo.pm: add $name to Log3 messages (Forum #85258)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16329 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-03-04 20:18:08 +00:00
parent d5052a7d77
commit 7b336dedea
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/DevIo.pm
View File

@ -211,7 +211,7 @@ DevIo_OpenDev($$$;$)
my $doCb = sub ($) { my $doCb = sub ($) {
my ($r) = @_; my ($r) = @_;
Log3 $name, 1, "Can't connect to $dev: $r" if(!$reopen && $r); Log3 $name, 1, "$name: Can't connect to $dev: $r" if(!$reopen && $r);
$callback->($hash,$r) if($callback); $callback->($hash,$r) if($callback);
return $r; return $r;
}; };
@ -279,7 +279,7 @@ DevIo_OpenDev($$$;$)
} }
if(!$conn) { if(!$conn) {
Log3 $name, 1, "Can't connect to $dev: $!" if(!$reopen); Log3 $name, 1, "$name: Can't connect to $dev: $!" if(!$reopen);
$readyfnlist{"$name.$dev"} = $hash; $readyfnlist{"$name.$dev"} = $hash;
DevIo_setStates($hash, "disconnected"); DevIo_setStates($hash, "disconnected");
return &$doCb(""); return &$doCb("");
@ -297,7 +297,7 @@ DevIo_OpenDev($$$;$)
$hash->{IODevPort} = $devPort if (defined($devPort)); $hash->{IODevPort} = $devPort if (defined($devPort));
$hash->{IODevParameters} = $baudrate if (defined($baudrate)); $hash->{IODevParameters} = $baudrate if (defined($baudrate));
if (!CallFn($devName, "IOOpenFn", $hash)) { if (!CallFn($devName, "IOOpenFn", $hash)) {
Log3 $name, 1, "Can't open $dev!"; Log3 $name, 1, "$name: Can't open $dev!";
DevIo_setStates($hash, "disconnected"); DevIo_setStates($hash, "disconnected");
return &$doCb(""); return &$doCb("");
} }
@ -324,7 +324,7 @@ DevIo_OpenDev($$$;$)
$conn->setsockopt(SOL_SOCKET, SO_KEEPALIVE, 1) if(defined($conn)); $conn->setsockopt(SOL_SOCKET, SO_KEEPALIVE, 1) if(defined($conn));
} else { } else {
Log3 $name, 1, "Can't connect to $dev: $!" if(!$reopen && $!); Log3 $name, 1, "$name: Can't connect to $dev: $!" if(!$reopen && $!);
$readyfnlist{"$name.$dev"} = $hash; $readyfnlist{"$name.$dev"} = $hash;
DevIo_setStates($hash, "disconnected"); DevIo_setStates($hash, "disconnected");
$hash->{NEXT_OPEN} = time() + $nextOpenDelay; $hash->{NEXT_OPEN} = time() + $nextOpenDelay;
@ -364,7 +364,7 @@ DevIo_OpenDev($$$;$)
if(!open($po, "+<$dev")) { if(!open($po, "+<$dev")) {
return &$doCb(undef) if($reopen); return &$doCb(undef) if($reopen);
Log3 $name, 1, "Can't open $dev: $!"; Log3 $name, 1, "$name: Can't open $dev: $!";
$readyfnlist{"$name.$dev"} = $hash; $readyfnlist{"$name.$dev"} = $hash;
DevIo_setStates($hash, "disconnected"); DevIo_setStates($hash, "disconnected");
return &$doCb(""); return &$doCb("");
@ -401,7 +401,7 @@ DevIo_OpenDev($$$;$)
if(!$po) { if(!$po) {
return &$doCb(undef) if($reopen); return &$doCb(undef) if($reopen);
Log3 $name, 1, "Can't open $dev: $!"; Log3 $name, 1, "$name: Can't open $dev: $!";
$readyfnlist{"$name.$dev"} = $hash; $readyfnlist{"$name.$dev"} = $hash;
DevIo_setStates($hash, "disconnected"); DevIo_setStates($hash, "disconnected");
return &$doCb(""); return &$doCb("");