Mirrors/Sequenzia
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed some errors in SimilarImages.

Browse Source 
- Correctly set-up cURL multi.
- Removed exception thrown if one request returned empty response. Instead, the error is logged and the script continues.
This commit is contained in:
Parziphal 2014-01-27 09:27:46 -05:00
parent cec5bb7b82
commit b77be4a59a
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/SimilarImages.php
View File

@ -50,7 +50,7 @@ class SimilarImages
$server_threads = []; $server_threads = [];
$server_responses = []; $server_responses = [];
$curl_opts = [ $curl_opts = [
CURLOPT_TIMEOUT => 4, CURLOPT_TIMEOUT => 5,
CURLOPT_POST => true, CURLOPT_POST => true,
CURLOPT_RETURNTRANSFER => true CURLOPT_RETURNTRANSFER => true
]; ];
@ -59,6 +59,7 @@ class SimilarImages
foreach ($services_by_server as $services_list) { foreach ($services_by_server as $services_list) {
$chk++; $chk++;
$search_url = null; $search_url = null;
if ($options['type'] == 'url') if ($options['type'] == 'url')
@ -67,9 +68,9 @@ class SimilarImages
$search_url = $options['source']['preview_url']; $search_url = $options['source']['preview_url'];
$params = []; $params = [];
if ($search_url) if ($search_url) {
$params['url'] = $search_url; $params['url'] = $search_url;
else { } else {
$params['file'] = '@' . $source_file; $params['file'] = '@' . $source_file;
} }
@ -94,8 +95,12 @@ class SimilarImages
do { do {
$ret = curl_multi_exec($mh, $active); $ret = curl_multi_exec($mh, $active);
} while ($ret == CURLM_CALL_MULTI_PERFORM); } while ($ret == CURLM_CALL_MULTI_PERFORM);
while ($active && $ret == CURLM_OK) { while ($active && $ret == CURLM_OK) {
if (curl_multi_select($mh) != -1) {
usleep(100);
}
do { do {
$mrc = curl_multi_exec($mh, $active); $mrc = curl_multi_exec($mh, $active);
} while ($mrc == CURLM_CALL_MULTI_PERFORM); } while ($mrc == CURLM_CALL_MULTI_PERFORM);
@ -127,7 +132,20 @@ class SimilarImages
$resp = curl_multi_getcontent($$chn); $resp = curl_multi_getcontent($$chn);
if (!$resp) { if (!$resp) {
throw new Exception("Empty response. cURL error: " . curl_error($$chn)); $curl_err = curl_error($$chn);
if (preg_match('/^Operation timed out/', $curl_err)) {
$err_msg = 'timed out';
Rails::log()->notice(
"[SimilarImages] cURL timed out: " . $curl_err
);
} else {
$err_msg = 'empty response';
Rails::log()->warning(sprintf(
"[SimilarImages] cURL error: (%s) %s", curl_errno($$chn), $curl_err
));
}
$errors[$server] = [ 'message' => $err_msg ];
continue;
} }
try { try {