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

NoHttpResponseException needed instead of HTTP_Request2_Exception

Browse Source 
HTTP_Request2_Exception assumed an HTTP response status code/line
This commit is contained in:
Mikael Nordfeldth 2016-01-13 14:08:48 +01:00
parent e75472f460
commit 3ed632decf
5 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/httpclient.php
View File

@ -290,7 +290,7 @@ class HTTPClient extends HTTP_Request2
$response = $this->send();
if (is_null($response)) {
// TRANS: Failed to retrieve a remote web resource, %s is the target URL.
throw new HTTP_Request2_Exception(sprintf(_m('HTTP request failed without response to URL: %s'), var_export($target, true)));
throw new NoHttpResponseException($url);
}
return $response;
}

43
lib/nohttpresponseexception.php Normal file
View File

@ -0,0 +1,43 @@
<?php
/**
* StatusNet, the distributed open-source microblogging tool
*
* Class for an exception when an HTTP request gets no response (DNS failure etc.)
*
* PHP version 5
*
* LICENCE: This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category Exception
* @package GNUsocial
* @author Mikael Nordfeldth <mmn@hethane.se>
* @copyright 2013 Free Software Foundation, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
* @link http://www.gnu.org/software/social/
*/
if (!defined('GNUSOCIAL')) { exit(1); }
// Can't extend HTTP_Request2_Exception since it requires an HTTP status code which we didn't get
class NoHttpResponseException extends Exception
{
public $url; // target URL
public function __construct($url)
{
$this->url = $url;
// We could log an entry here with the search parameters
parent::__construct(sprintf(_('No HTTP response from URL %s.'), _ve($url)));
}
}

4
lib/queuemonitor.php
View File

@ -102,8 +102,8 @@ class QueueMonitor
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));
} catch (NoHttpResponseException $e) {
common_log(LOG_ERR, __METHOD__ . ':'.$e->getMessage());
}
}

2
plugins/OStatus/lib/discoveryhints.php
View File

@ -64,7 +64,7 @@ class DiscoveryHints {
if (!$response->isOk()) {
return null;
}
} catch (HTTP_Request2_Exception $e) {
} catch (NoHttpResponseException $e) {
// Any HTTPClient error that might've been thrown
return null;
}

2
plugins/OStatus/tests/slap.php
View File

@ -80,7 +80,7 @@ if (have_option('--verify')) {
print $response->getStatus() . "\n\n";
print $response->getBody() . "\n\n";
} catch (HTTP_Request2_Exception $e) {
} catch (NoHttpResponseException $e) {
print 'Failed POST to URL '.var_export($url, true).': '.$e->getMessage();
}
}