Skip to content

prevent HttpPing from crashing on GuzzleHttp\Exception\ServerException #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 9, 2017
Merged

prevent HttpPing from crashing on GuzzleHttp\Exception\ServerException #12

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49dcdb5
prevent command from crashing on GuzzleHttp\Exception\ServerException…
webvimark Jan 9, 2017
3879d0e
if http ping failed with timeout after successful one, it should have…
webvimark Jan 9, 2017
af505b2
check that response is not null on RequestException
webvimark Jan 9, 2017
1db8624
set response code to NULL on exception
webvimark Jan 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions src/Monitors/HttpPingMonitor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
use EricMakesStuff\ServerMonitor\Events\HttpPingUp;
use EricMakesStuff\ServerMonitor\Exceptions\InvalidConfiguration;
use GuzzleHttp\Client as Guzzle;
use GuzzleHttp\Exception\ClientException;
use GuzzleHttp\Exception\ConnectException;
use GuzzleHttp\Exception\RequestException;
use Psr\Http\Message\ResponseInterface;

class HttpPingMonitor extends BaseMonitor
{
Expand Down Expand Up @@ -71,10 +71,18 @@ public function runMonitor()
$response = $guzzle->get($this->url);
$this->responseCode = $response->getStatusCode();
$this->responseContent = (string)$response->getBody();
} catch (ClientException $e) {
} catch (RequestException $e) {
$response = $e->getResponse();
$this->responseCode = $response->getStatusCode();
} catch (ConnectException $e) {

if ($response instanceof ResponseInterface) {
$this->responseCode = $response->getStatusCode();
$this->responseContent = (string)$response->getBody();
} else {
$this->setResponseCodeAndContentOnException($e);
}

} catch (\Exception $e) {
$this->setResponseCodeAndContentOnException($e);
}

if ($this->responseCode != '200'
Expand All @@ -85,6 +93,15 @@ public function runMonitor()
}
}

/**
* @param \Exception $e
*/
protected function setResponseCodeAndContentOnException(\Exception $e)
{
$this->responseCode = null;
$this->responseContent = $e->getMessage() . PHP_EOL . $e->getTraceAsString();
}

protected function checkResponseContains($html, $phrase)
{
if (!$phrase) {
Expand Down