From 667dfcdfc69e31b599f8404439caa0237acc2ac7 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Mon, 7 Jan 2013 20:03:53 +0000 Subject: [PATCH] Added optional loglevel parameter git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2450 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/HttpUtils.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/FHEM/HttpUtils.pm b/FHEM/HttpUtils.pm index 4a4df1674..93f0080d7 100644 --- a/FHEM/HttpUtils.pm +++ b/FHEM/HttpUtils.pm @@ -49,12 +49,13 @@ urlEncode($) { sub CustomGetFileFromURL($$@) { - my ($quiet, $url, $timeout, $data, $noshutdown) = @_; + my ($quiet, $url, $timeout, $data, $noshutdown, $loglevel) = @_; $timeout = 4.0 if(!defined($timeout)); + $loglevel = 1 if(!$loglevel); my $displayurl= $quiet ? "" : $url; if($url !~ /^(http|https):\/\/([^:\/]+)(:\d+)?(\/.*)$/) { - Log 1, "CustomGetFileFromURL $displayurl: malformed or unsupported URL"; + Log $loglevel, "CustomGetFileFromURL $displayurl: malformed or unsupported URL"; return undef; } @@ -72,7 +73,7 @@ CustomGetFileFromURL($$@) if($protocol eq "https") { eval "use IO::Socket::SSL"; if($@) { - Log 1, $@; + Log $loglevel, $@; } else { $conn = IO::Socket::SSL->new(PeerAddr=>"$host:$port", Timeout=>$timeout); } @@ -80,7 +81,7 @@ CustomGetFileFromURL($$@) $conn = IO::Socket::INET->new(PeerAddr=>"$host:$port", Timeout=>$timeout); } if(!$conn) { - Log 1, "CustomGetFileFromURL $displayurl: Can't connect to $protocol://$host:$port\n"; + Log $loglevel, "CustomGetFileFromURL $displayurl: Can't connect to $protocol://$host:$port\n"; undef $conn; return undef; } @@ -103,7 +104,7 @@ CustomGetFileFromURL($$@) vec($rin, $conn->fileno(), 1) = 1; my $nfound = select($rout=$rin, undef, undef, $timeout); if($nfound <= 0) { - Log 1, "CustomGetFileFromURL $displayurl: Select timeout/error: $!"; + Log $loglevel, "CustomGetFileFromURL $displayurl: Select timeout/error: $!"; undef $conn; return undef; }