LesLibres.org/Rss-Bridge
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[contents] Add debug messages for 'getContents'

Browse source 
Adds additional messages to the error log when fetching contents. The
data is helpful in finding issues with receiving contents from servers.

References: #879, #882, #884
This commit is contained in:
logmanoriginal 2018-10-24 16:10:29 +02:00
parent 89ca42da54
commit dbd44f64dd
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/contents.php
View file

@ -1,24 +1,37 @@
<?php <?php
function getContents($url, $header = array(), $opts = array()){ function getContents($url, $header = array(), $opts = array()){
debugMessage('Reading contents from "' . $url . '"');
$ch = curl_init($url); $ch = curl_init($url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
if(is_array($header) && count($header) !== 0) if(is_array($header) && count($header) !== 0) {
debugMessage('Setting headers: ' . json_encode($header));
curl_setopt($ch, CURLOPT_HTTPHEADER, $header); curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
}
curl_setopt($ch, CURLOPT_USERAGENT, ini_get('user_agent')); curl_setopt($ch, CURLOPT_USERAGENT, ini_get('user_agent'));
curl_setopt($ch, CURLOPT_ENCODING, ''); curl_setopt($ch, CURLOPT_ENCODING, '');
curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS); curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
if(is_array($opts)) { if(is_array($opts)) {
debugMessage('Setting options: ' . json_encode($opts));
foreach($opts as $key => $value) { foreach($opts as $key => $value) {
curl_setopt($ch, $key, $value); curl_setopt($ch, $key, $value);
} }
} }
if(defined('PROXY_URL') && !defined('NOPROXY')) { if(defined('PROXY_URL') && !defined('NOPROXY')) {
debugMessage('Setting proxy url: ' . PROXY_URL);
curl_setopt($ch, CURLOPT_PROXY, PROXY_URL); curl_setopt($ch, CURLOPT_PROXY, PROXY_URL);
} }
// We always want the response header as part of the data! // We always want the response header as part of the data!
@ -34,6 +47,9 @@ function getContents($url, $header = array(), $opts = array()){
$headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE); $headerSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
$errorCode = curl_getinfo($ch, CURLINFO_HTTP_CODE); $errorCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$header = substr($data, 0, $headerSize); $header = substr($data, 0, $headerSize);
debugMessage('Response header: ' . $header);
$headers = parseResponseHeader($header); $headers = parseResponseHeader($header);
$finalHeader = end($headers); $finalHeader = end($headers);