Skip to content

[Fix] v1.2.4 TokenStorage only when MainRequest exists #7

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
Aug 31, 2021
Merged

[Fix] v1.2.4 TokenStorage only when MainRequest exists #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9bdfac3
using token only when there is a master request
sinansoezen Aug 31, 2021
5a6c50c
updated main branch name for ci
sinansoezen Aug 31, 2021
b48bc9d
updated readme badge
sinansoezen Aug 31, 2021
e586f60
fixed badge branch
sinansoezen Aug 31, 2021
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
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

name: Continuous Integration
name: GitHub Actions

on:
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# sblum Exception Enricher Bundle

[![Build Status](https://travis-ci.org/sblum/exception-enricher.svg?branch=master)](https://travis-ci.org/sblum/exception-enricher)
[![Build Status](https://github.com/sblum/exception-enricher/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/sblum/exception-enricher/actions)
[![Latest Stable Version](https://poser.pugx.org/sblum/exception-enricher/v/stable)](https://packagist.org/packages/sblum/exception-enricher)
[![License](https://poser.pugx.org/sblum/exception-enricher/license)](https://packagist.org/packages/sblum/exception-enricher)

Expand Down
8 changes: 4 additions & 4 deletions src/ExceptionEnricher/Processor/ExceptionEnricherProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ public function __invoke(array $record): array

if ($this->requestStack->getMainRequest()) {
$record['extra']['request_ip'] = $this->requestStack->getMainRequest()->getClientIp();
}
}

if ($this->tokenStorage && $this->tokenStorage->getToken()) {
$record['extra']['username'] = $this->tokenStorage->getToken()->getUserIdentifier();
if ($this->tokenStorage && $this->tokenStorage->getToken()) {
$record['extra']['username'] = $this->tokenStorage->getToken()->getUserIdentifier();
}
}
}

return $record;
Expand Down