Skip to content
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

Jump to bottom

Just one type of exception provides response object. #83

Merged
merged 2 commits into from
Feb 11, 2015
Merged

Just one type of exception provides response object. #83

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35fa168
Just one type of exception provides response object.
Jan 30, 2015
4106f74
Typo: same exception was used in two catch lines. Changed to use Http…
Feb 8, 2015
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
7 changes: 6 additions & 1 deletion php/class-terminus-command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,14 @@ public static function request($realm, $uuid, $path = FALSE, $method = 'GET', $o
);
$cache->put_data($cachekey, $data);
return $data;
} catch( Exception $e ) {
} catch( Guzzle\Http\Exception\BadResponseException $e ) {
$response = $e->getResponse();
\Terminus::error("%s", $response->getBody(TRUE) );
} catch( Guzzle\Http\Exception\BadResponseException $e ) {
$request = $e->getRequest();
\Terminus::error("Request %s had failed: %s", (string)$request, $e->getMessage() );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you meant to delete lines 156-158 right? Also the reason I was using $response->getBody() is Guzzle throws the exception even when the api returns a valid error response and in those cases we want to know what the API said, not just what the Guzzle exception is. In fact, in most cases the Guzzle exception is useless. So I'd say check for response object first and if so return the body, otherwise return the guzzle exception.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The trouble is that if there is a cURL failure (timeout, certificate, etc.) - different Exception is thrown. Exception which doesn't implement getResponse method. And then crash contains meaningless information that non-existant method cannot be invoked.

I saw failures Site already exists: <uuid> which are properly handled by this getResponse body - I can extract valuable information then.

So I introduced these two extra tiers to catch different exception types and print corresponding error messages which allows to properly address failure (retry timeouts, notify on other failures, etc.).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand why you did it but I think there's a typo because the exception class referred to in lines 156 and 159 seem to be the same.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jbutkus Just to clarify the issue: there are currently 2 duplicated catch blocks for Guzzle\Http\Exception\BadResponseException. Did you mean for one of them to capture a Curl exception instead?

} catch( Exception $e ) {
\Terminus::error("Unrecognised request failure: %s", $e->getMessage() );
}

}
Expand Down