[HttpKernel] Support unknown format in LoggerDataCollector #22961
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| if (false !== ($pos = strpos($log, ':')) && $pos !== (strlen($log) - 1)) { | ||
| list($pass, $message) = explode(': ', $log, 2); | ||
| } else { | ||
| $pass = 'Unknown Compiler Pass'; |
There was a problem hiding this comment.
what about something like:
$log = explode(': ', $log, 2);
if (!isset($log[1]) || !class_exists($log[0], false)) {
$log = array('Unknown Compiler Pass', implode(': ', $log));
}There was a problem hiding this comment.
@nicolas-grekas this seems flaky due to disabling autoloading on the class_exists (becomes unknown). As this logging is aggregated during a run-time request, I can imagine the classes to never exist in the first place.
It works fine if I allow autoloading and I don't think this should be an issue for dev
| @@ -138,6 +138,9 @@ private function getContainerCompilerLogs() | |||
| $logs = array(); | |||
| foreach (file($file, FILE_IGNORE_NEW_LINES) as $log) { | |||
| $log = explode(': ', $log, 2); | |||
| if (!isset($log[1]) || !class_exists($log[0])) { | |||
There was a problem hiding this comment.
let's do it with a regexp instead of class_exists?
|| !preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)++$/', $log[0])
There was a problem hiding this comment.
That seems to work!
fabpot
approved these changes
May 31, 2017
|
Thank you @iltar. |
fabpot
added a commit
that referenced
this pull request
May 31, 2017
… (iltar) This PR was merged into the 3.3 branch. Discussion ---------- [HttpKernel] Support unknown format in LoggerDataCollector | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #22952 | License | MIT | Doc PR | ~ The new expected format for the compiler log is `CompilerPassClass: Message`. However, this is not enforced by the old logging method as seen in schmittjoh/JMSDiExtraBundle#276 This PR adds the ability to read those lines without crashing with `Uncaught Notice: Undefined offset: 1`. Please note that I have not tested this in an application so testers are welcome to confirm this fix! Commits ------- a8dfbb1 Support unknown compiler log format
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The new expected format for the compiler log is
CompilerPassClass: Message. However, this is not enforced by the old logging method as seen in schmittjoh/JMSDiExtraBundle#276This PR adds the ability to read those lines without crashing with
Uncaught Notice: Undefined offset: 1.Please note that I have not tested this in an application so testers are welcome to confirm this fix!