diff --git a/composer.lock b/composer.lock index 9d0e8ee7..12939c00 100644 --- a/composer.lock +++ b/composer.lock @@ -629,16 +629,16 @@ }, { "name": "laravel/framework", - "version": "v5.1.12", + "version": "v5.1.16", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "76a9816f37a58383f6ba093ccf08f253e5488555" + "reference": "e34dcc0c57e0f560248aec5128161256ff8bf4e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/76a9816f37a58383f6ba093ccf08f253e5488555", - "reference": "76a9816f37a58383f6ba093ccf08f253e5488555", + "url": "https://api.github.com/repos/laravel/framework/zipball/e34dcc0c57e0f560248aec5128161256ff8bf4e1", + "reference": "e34dcc0c57e0f560248aec5128161256ff8bf4e1", "shasum": "" }, "require": { @@ -753,20 +753,20 @@ "framework", "laravel" ], - "time": "2015-08-30 23:25:48" + "time": "2015-09-04 12:46:14" }, { "name": "league/flysystem", - "version": "1.0.11", + "version": "1.0.12", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "c16222fdc02467eaa12cb6d6d0e65527741f6040" + "reference": "7323424a9d39c24e597ed3f2144419dfbb52e086" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c16222fdc02467eaa12cb6d6d0e65527741f6040", - "reference": "c16222fdc02467eaa12cb6d6d0e65527741f6040", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7323424a9d39c24e597ed3f2144419dfbb52e086", + "reference": "7323424a9d39c24e597ed3f2144419dfbb52e086", "shasum": "" }, "require": { @@ -834,7 +834,7 @@ "sftp", "storage" ], - "time": "2015-07-28 20:41:58" + "time": "2015-09-05 12:06:41" }, { "name": "monolog/monolog", diff --git a/config/app.php b/config/app.php index 92beb136..1d58ba7b 100644 --- a/config/app.php +++ b/config/app.php @@ -144,7 +144,7 @@ return [ App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, -// Intouch\LaravelNewrelic\LaravelNewrelicServiceProvider::class, + Intouch\LaravelNewrelic\NewrelicServiceProvider::class, Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class, ], @@ -195,7 +195,7 @@ return [ 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, -// 'Newrelic' => Intouch\LaravelNewrelic\Facades\Newrelic::class, + 'Newrelic' => Intouch\LaravelNewrelic\Facades\Newrelic::class, ], diff --git a/config/newrelic.php b/config/newrelic.php new file mode 100644 index 00000000..46a27527 --- /dev/null +++ b/config/newrelic.php @@ -0,0 +1,42 @@ + true, + + /* + * Define the name used when automatically naming transactions. + * a token string: + * a pattern you define yourself, available tokens: + * {controller} = Controller@action or Closure@path + * {method} = GET / POST / etc. + * {route} = route name if named, otherwise same as {controller} + * {path} = the registered route path (includes variable names) + * {uri} = the actual URI requested + * anything that is not a matched token will remain a string literal + * example: + * "GET /world" with pattern 'hello {path} you really {method} me' would return: + * 'hello /world you really GET me' + */ + 'name_provider' => '{uri} {route}', + + /* + * Will cause an exception to be thrown if the NewRelic + * PHP agent is not found / installed + */ + 'throw_if_not_installed' => false, + +);