Merge pull request #25 from stevensunny/patch-1.1

return string 'controller@action' instead of boolean value
In-Touch · Apr 24, 2015 · af02c53 · af02c53
2 parents d170386 + a74a803
commit af02c53
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Intouch/LaravelNewrelic/LaravelNewrelicServiceProvider.php b/src/Intouch/LaravelNewrelic/LaravelNewrelicServiceProvider.php
@@ -106,9 +106,15 @@ public function getTransactionName( $request, $response, $app )
             /** @var \Illuminate\Routing\Router $router */
             $router = $app['router'];
 
-            $name = $router->currentRouteName()
-                ?: $router->current() && $router->currentRouteAction()
-                ?: $request->getMethod() . ' ' . $request->getPathInfo();
+            if ( $router->currentRouteName() ) { 
+                $name = $router->currentRouteName();
+            } else {
+                if ( $router->current() && $router->currentRouteAction() ) {
+                    $name = $router->currentRouteAction();
+                } else {
+                    $name = $request->getMethod() . ' ' . $request->getPathInfo();
+                }
+            }
         }
 
         return $name;