8000 Improved the logger panel when the log context is very long by javiereguiluz · Pull Request #17852 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Improved the logger panel when the log context is very long #17852

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

Closed
wants to merge 4 commits into from
Closed

Improved the logger panel when the log context is very long #17852

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
7ecc9ec
Improved the logger panel when the log context is very long
javiereguiluz Feb 19, 2016
5995abe
Minor tweak
javiereguiluz Feb 19, 2016
f0779e1
Show context as pseudo-PHP instead of JSON
javiereguiluz Feb 22, 2016
a46c897
Don't display the full context when is very long
javiereguiluz Feb 22, 2016
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
43 changes: 28 additions & 15 deletions src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<p>There are no log messages of this level.</p>
</div>
{% else %}
{{ helper.render_table(info_and_error_logs, true) }}
{{ helper.render_table(info_and_error_logs, 'info', true) }}
{% endif %}
</div>
</div>
Expand All @@ -92,7 +92,7 @@
<p>There are no log messages about deprecated features.</p>
</div>
{% else %}
{{ helper.render_table(deprecation_logs, false, true) }}
{{ helper.render_table(deprecation_logs, 'deprecation', false, true) }}
{% endif %}
</div>
</div>
Expand All @@ -106,7 +106,7 @@
<p>There are no log messages of this level.</p>
</div>
{% else %}
{{ helper.render_table(debug_logs) }}
{{ helper.render_table(debug_logs, 'debug') }}
{% endif %}
</div>
</div>
Expand All @@ -120,7 +120,7 @@
<p>There are no log messages of this level.</p>
</div>
{% else %}
{{ helper.render_table(silenced_logs) }}
{{ helper.render_table(silenced_logs, 'silenced') }}
{% endif %}
</div>
</div>
Expand All @@ -129,7 +129,7 @@
{% endif %}
{% endblock %}

{% macro render_table(logs, show_level = false, is_deprecation = false) %}
{% macro render_table(logs, category = '', show_level = false, is_deprecation = false) %}
{% import _self as helper %}
{% set channel_is_defined = (logs|first).channel is defined %}

Expand Down Expand Up @@ -160,31 +160,31 @@
<td class="font-normal text-small text-bold nowrap">{{ log.channel }}</td>
{% endif %}

<td class="font-normal">{{ helper.render_log_message(loop.index, log, is_deprecation) }}</td>
<td class="font-normal">{{ helper.render_log_message(category, loop.index, log, is_deprecation) }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endmacro %}

{% macro render_log_message(log_index, log, is_deprecation = false) %}
{% macro render_log_message(category, log_index, log, is_deprecation = false) %}
{{ log.message }}

{% if is_deprecation %}
{% set stack = log.context.stack|default([]) %}
{% set id = 'sf-call-stack-' ~ log_index %}
{% set stack_id = 'sf-call-stack-' ~ category ~ '-' ~ log_index %}

{% if log.context.errorCount is defined %}
<span class="text-small text-bold">({{ log.context.errorCount }} times)</span>
{% endif %}

{% if stack %}
<button class="btn-link text-small sf-toggle" data-toggle-selector="#{{ id }}" data-toggle-alt-content="Hide stack trace">Show stack trace</button>
<button class="btn-link text-small sf-toggle" data-toggle-selector="#{{ stack_id }}" data-toggle-alt-content="Hide stack trace">Show stack trace</button>
{% endif %}

{% for index, call in stack if index > 1 %}
{% if index == 2 %}
<ul class="sf-call-stack hidden" id="{{ id }}">
<ul class="sf-call-stack hidden" id="{{ stack_id }}">
{% endif %}

{% if call.class is defined %}
Expand Down Expand Up @@ -212,11 +212,24 @@
{% endfor %}
{% else %}
{% if log.context is defined and log.context is not empty %}
<span class="metadata">
<strong>Context</strong>: {{ log.context|json_encode(64 b-or 256)|replace({
'{"' : '{ "', '"}' : '" }', '":{' : '": {', '":"' : '": "', '","' : '", "'
}) }}
</span>
{% set context_id = 'context-' ~ category ~ '-' ~ log_index %}
{% set context_dump = profiler_dump(log.context) %}

<div class="metadata">
<strong>Context</strong>:

{% if context_dump|length > 120 %}
{{ context_dump[:120] }} ...

<a class="btn-link text-small sf-toggle" data-toggle-selector="#{{ context_id }}" data-toggle-alt-content="Hide full context">Show full context</a>

<div id="{{ context_id }}" class="context">
<pre>{{ context_dump }}</pre>
</div>
{% else %}
{{ context_dump }}
{% endif %}
</div>
{% endif %}
{% endif %}
{% endmacro %}
8 changes: 8 additions & 0 deletions src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,14 @@ table.logs .metadata {
table.logs .metadata strong {
color: #222;
}
table.logs .metadata .context {
background: #F5F5F5;
color: #222;
}
table.logs .metadata .context pre {
margin: 5px 0;
padding: 5px 10px;
}

table.logs .sf-call-stack {
margin: 1em 0 1em 1.5em;
Expand Down
0