Added exception handling

Author: Nyholm

Collector/Neo4jDataCollector.php

@@ -28,9 +28,12 @@ public function __construct(QueryLogger $logger)
      */
     public function collect(Request $request, Response $response, \Exception $exception = null)
     {
+        $this->data['time'] = $this->queryLogger->getElapsedTime();
         $this->data['nb_queries'] = count($this->queryLogger);
         $this->data['statements'] = $this->queryLogger->getStatements();
-        $this->data['time'] = $this->queryLogger->getElapsedTime();
+        $this->data['failed_statements'] = array_filter($this->queryLogger->getStatements(), function ($statement) {
+            return !$statement['success'];
+        });
     }
 
     /**
@@ -42,13 +45,25 @@ public function getQueryCount()
     }
 
     /**
-     * @return QueryLogger
+     * Return all statements, successful and not successful.
+     *
+     * @return array
      */
     public function getStatements()
     {
         return $this->data['statements'];
     }
 
+    /**
+     * Return not successful statements.
+     *
+     * @return array
+     */
+    public function getFailedStatements()
+    {
+        return $this->data['failed_statements'];
+    }
+
     /**
      * @return float
      */

Collector/QueryLogger.php

@@ -39,6 +39,7 @@ public function record(StatementInterface $statement)
         $statementParams = json_encode($statement->parameters());
         $tag = $statement->getTag() ?: -1;
 
+        // Make sure we do not record the same statement twice
         if (isset($this->statementsHash[$statementText][$statementParams][$tag])) {
             return;
         }
@@ -85,6 +86,7 @@ public function finish(StatementResultInterface $statementResult)
             'nb_results' => $statementResult->size(),
             'statistics' => $this->statisticsToArray($statementResult->summarize()->updateStatistics()),
             'scheme' => $scheme,
+            'success' => true,
         ]);
     }
 
@@ -93,7 +95,13 @@ public function finish(StatementResultInterface $statementResult)
      */
     public function logException(Neo4jExceptionInterface $exception)
     {
-        // TODO log exceptions
+        $idx = $this->nbQueries - 1;
+        $this->statements[$idx] = array_merge($this->statements[$idx], [
+            'end_time' => microtime(true) * 1000,
+            'exceptionCode' => method_exists($exception, 'classification') ? $exception->classification() : '',
+            'exceptionMessage' => method_exists($exception, 'getMessage') ? $exception->getMessage() : '',
+            'success' => false,
+        ]);
     }
 
     /**

Resources/public/style/neo4j.css

@@ -0,0 +1,3 @@
+.bg-red {
+    background-color: #B0413E;
+}

Resources/views/webprofiler.html.twig

@@ -11,15 +11,21 @@
         {% set text %}
             <div class="sf-toolbar-info-piece">
                 <b>Query count</b>
-                <span>{{ collector.queryCount }}</span>
+                <span class="sf-toolbar-status">{{ collector.queryCount }}</span>
             </div>
+            {% if collector.failedStatements|length %}
+            <div class="sf-toolbar-info-piece">
+                <b>Failed queries</b>
+                <span class="sf-toolbar-status sf-toolbar-status-red">{{ collector.failedStatements|length }}</span>
+            </div>
+            {% endif %}
             <div class="sf-toolbar-info-piece">
                 <b>Total time</b>
-                <span>{{ '%0.2f'|format(collector.time) }}ms</span>
+                <span class="sf-toolbar-status">{{ '%0.2f'|format(collector.time) }}ms</span>
             </div>
 
         {% endset %}
-        {% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url } %}
+        {% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url, 'status': collector.failedStatements|length ? 'red' : '' } %}
     {% endif %}
 {% endblock %}
 
@@ -31,11 +37,16 @@
 
 {% block menu %}
     {# This left-hand menu appears when using the full-screen profiler. #}
-    <span class="label {{ collector.queryCount == 0 ? 'disabled' }}">
+    <span class="label {{ collector.queryCount == 0 ? 'disabled' }} {{ collector.failedStatements|length ? 'label-status-error' }}">
         <span class="icon">
             {{ include('@Neo4j/Icon/neo4j.svg') }}
         </span>
         <strong>Neo4j</strong>
+        {% if collector.failedStatements|length %}
+            <span class="count">
+                <span>{{ collector.failedStatements|length }}</span>
+             </span>
+        {% endif %}
     </span>
 {% endblock %}
 
@@ -56,7 +67,7 @@
             {% set start_time = statement.start_time|default(null) %}
             {% set end_time = statement.end_time|default(null) %}
 
-            <td class="nowrap">{{ idx + 1 }}</td>
+            <td class="nowrap{% if not statement.success %} bg-red{% endif %}">{{ idx + 1 }}</td>
             <td class="nowrap">{% if start_time is not null and end_time is not null %}{{ '%0.2f'|format(end_time - start_time) }}ms{% endif %}</td>
             <td>
                 <div>
@@ -73,6 +84,7 @@
                     <div>
                         <strong class="font-normal text-small">Tag</strong>: {{ statement.tag|default('N/A')|yaml_encode }}
                     </div>
+                    {% if statement.sucess %}
                     <div>
                         <strong class="font-normal text-small">Number of results</strong>: {{ statement.nb_results }}
                     </div>
@@ -82,6 +94,14 @@
                     <div>
                         <strong class="font-normal text-small">Statistics</strong>: {{ statement.statistics|yaml_encode }}
                     </div>
+                    {% else %}
+                    <div>
+                        <strong class="font-normal text-small">Type</strong>: {{ statement.exceptionCode }}
+                    </div>
+                    <div>
+                        <strong class="font-normal text-small">message</strong>: {{ statement.exceptionMessage }}
+                    </div>
+                    {% endif %}
                 </div>
             </td>
         </tr>