Skip to content

support [email protected] #21

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 2 commits into from
Feb 11, 2022
Merged

support [email protected] #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9805cf
support [email protected]
ro0NL Feb 10, 2022
d40ccee
ye
ro0NL Feb 10, 2022
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
12 changes: 10 additions & 2 deletions spec/LoggerPluginSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ function it_logs_request_and_response(
ResponseInterface $response
) {
$formatter->formatRequest($request)->willReturn('GET / 1.1');
$formatter->formatResponse($response)->willReturn('200 OK 1.1');
if (method_exists(Formatter\SimpleFormatter::class, 'formatResponseForRequest')) {
$formatter->formatResponseForRequest($response, $request)->willReturn('200 OK 1.1');
} else {
$formatter->formatResponse($response)->willReturn('200 OK 1.1');
}

$logger->info(
"Sending request:\nGET / 1.1",
Expand Down Expand Up @@ -108,7 +112,11 @@ function it_logs_response_within_exception(
ResponseInterface $response
) {
$formatter->formatRequest($request)->willReturn('GET / 1.1');
$formatter->formatResponse($response)->willReturn('403 Forbidden 1.1');
if (method_exists(Formatter\SimpleFormatter::class, 'formatResponseForRequest')) {
$formatter->formatResponseForRequest($response, $request)->willReturn('403 Forbidden 1.1');
} else {
$formatter->formatResponse($response)->willReturn('403 Forbidden 1.1');
}

$exception = new HttpException('Forbidden', $request->getWrappedObject(), $response->getWrappedObject());

Expand Down
12 changes: 9 additions & 3 deletions src/LoggerPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,13 @@ protected function doHandleRequest(RequestInterface $request, callable $next, ca
$uid = uniqid('', true);
$this->logger->info(sprintf("Sending request:\n%s", $this->formatter->formatRequest($request)), ['request' => $request, 'uid' => $uid]);

return $next($request)->then(function (ResponseInterface $response) use ($start, $uid) {
return $next($request)->then(function (ResponseInterface $response) use ($start, $uid, $request) {
$milliseconds = (int) round(hrtime(true) / 1E6 - $start);
$formattedResponse = method_exists($this->formatter, 'formatResponseForRequest')
? $this->formatter->formatResponseForRequest($response, $request)
: $this->formatter->formatResponse($response);
$this->logger->info(
sprintf("Received response:\n%s", $this->formatter->formatResponse($response)),
sprintf("Received response:\n%s", $formattedResponse),
[
'milliseconds' => $milliseconds,
'uid' => $uid,
Expand All @@ -49,8 +52,11 @@ protected function doHandleRequest(RequestInterface $request, callable $next, ca
}, function (Exception $exception) use ($request, $start, $uid) {
$milliseconds = (int) round((hrtime(true) / 1E6 - $start));
if ($exception instanceof Exception\HttpException) {
$formattedResponse = method_exists($this->formatter, 'formatResponseForRequest')
? $this->formatter->formatResponseForRequest($exception->getResponse(), $exception->getRequest())
: $this->formatter->formatResponse($exception->getResponse());
$this->logger->error(
sprintf("Error:\n%s\nwith response:\n%s", $exception->getMessage(), $this->formatter->formatResponse($exception->getResponse())),
sprintf("Error:\n%s\nwith response:\n%s", $exception->getMessage(), $formattedResponse),
[
'exception' => $exception,
'milliseconds' => $milliseconds,
Expand Down