GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

HTTPClient would return null instead of exception

Browse Source 
This caused $response->isOK() tests to call a function on a non-existing object, causing all hell to break loose.
This commit is contained in:
Mikael Nordfeldth
2016-01-11 02:36:59 +01:00
parent 87ae5292b8
commit b13f8df79b
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/queuemonitor.php
View File

@@ -96,11 +96,14 @@ class QueueMonitor
protected function pingHttp($target, $data)
{
$client = new HTTPClient();
$result = $client->post($target, array(), $data);
try {
$result = $client->post($target, array(), $data);
if (!$result->isOk()) {
common_log(LOG_ERR, __METHOD__ . ' HTTP ' . $result->getStatus() .
': ' . $result->getBody());
if (!$result->isOk()) {
common_log(LOG_ERR, __METHOD__ . ' HTTP ' . $result->getStatus() . ': ' . $result->getBody());
}
} catch (HTTP_Request2_Exception $e) {
common_log(LOG_ERR, __METHOD__ . ' HTTP request generated PHP level error (check logs, could be DNS failure etc.). URL: '.var_export($target,true));
}
}