From f82c6a44a11b86058c1ccdf5aa642ca8bbe0dd30 Mon Sep 17 00:00:00 2001 From: delmar <> Date: Sun, 14 Oct 2018 23:49:09 +0000 Subject: [PATCH] 70_ZoneMinder:trying to fix disconnect git-svn-id: https://svn.fhem.de/fhem/trunk@17534 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/70_ZoneMinder.pm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/fhem/FHEM/70_ZoneMinder.pm b/fhem/FHEM/70_ZoneMinder.pm index f0ffa5a11..cd730806f 100755 --- a/fhem/FHEM/70_ZoneMinder.pm +++ b/fhem/FHEM/70_ZoneMinder.pm @@ -91,6 +91,8 @@ sub ZoneMinder_Define { $hash->{helper}{ZM_PASSWORD} = $a[4]; } +# Log3 $name, 3, "ZoneMinder ($name) - Define done ... module=$module, zmHost=$zmHost"; + DevIo_CloseDev($hash) if (DevIo_IsOpen($hash)); DevIo_OpenDev($hash, 0, undef); @@ -116,13 +118,13 @@ sub ZoneMinder_getZmWebUrl { #use private or public LAN for Web access? my $publicAddress = ZoneMinder_getPublicAddress($hash); my $zmHost = ''; - +# Log3 $name, 0, "ZoneMinder ($name) - publicAddress: $publicAddress, usePublic: $usePublic"; if ($publicAddress and $usePublic) { $zmHost = $publicAddress; } else { $zmHost = $hash->{helper}{ZM_HOST}; - $zmHost = "http://$zmHost"; } + $zmHost = "http://$zmHost"; $zmHost .= '/' if (not $zmHost =~ m/\/$/); my $zmWebContext = $attr{$name}{webConsoleContext}; @@ -634,14 +636,7 @@ sub ZoneMinder_Ready { my $name = $hash->{NAME}; if ( $hash->{STATE} eq "disconnected" ) { - my $err = DevIo_OpenDev($hash, 1, undef ); #if success, $err is undef - if (not $err) { - Log3 $name, 3, "ZoneMinder ($name) - reconnect to ZoneMinder successful"; - return 1; - } else { - Log3 $name, 0, "ZoneMinder ($name) - reconnect to ZoneMinder failed: $err"; - return $err; - } + return DevIo_OpenDev($hash, 1, undef ); #if success, $err is undef } # This is relevant for Windows/USB only