mirror of
https://github.com/Poniverse/Pony.fm.git
synced 2024-11-25 06:27:59 +01:00
Update dependencies; add Newrelic
This commit is contained in:
parent
ec93ebb8fe
commit
debbfffae9
3 changed files with 54 additions and 12 deletions
20
composer.lock
generated
20
composer.lock
generated
|
@ -629,16 +629,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/framework",
|
"name": "laravel/framework",
|
||||||
"version": "v5.1.12",
|
"version": "v5.1.16",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/framework.git",
|
"url": "https://github.com/laravel/framework.git",
|
||||||
"reference": "76a9816f37a58383f6ba093ccf08f253e5488555"
|
"reference": "e34dcc0c57e0f560248aec5128161256ff8bf4e1"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/framework/zipball/76a9816f37a58383f6ba093ccf08f253e5488555",
|
"url": "https://api.github.com/repos/laravel/framework/zipball/e34dcc0c57e0f560248aec5128161256ff8bf4e1",
|
||||||
"reference": "76a9816f37a58383f6ba093ccf08f253e5488555",
|
"reference": "e34dcc0c57e0f560248aec5128161256ff8bf4e1",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -753,20 +753,20 @@
|
||||||
"framework",
|
"framework",
|
||||||
"laravel"
|
"laravel"
|
||||||
],
|
],
|
||||||
"time": "2015-08-30 23:25:48"
|
"time": "2015-09-04 12:46:14"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/flysystem",
|
"name": "league/flysystem",
|
||||||
"version": "1.0.11",
|
"version": "1.0.12",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/thephpleague/flysystem.git",
|
"url": "https://github.com/thephpleague/flysystem.git",
|
||||||
"reference": "c16222fdc02467eaa12cb6d6d0e65527741f6040"
|
"reference": "7323424a9d39c24e597ed3f2144419dfbb52e086"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c16222fdc02467eaa12cb6d6d0e65527741f6040",
|
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7323424a9d39c24e597ed3f2144419dfbb52e086",
|
||||||
"reference": "c16222fdc02467eaa12cb6d6d0e65527741f6040",
|
"reference": "7323424a9d39c24e597ed3f2144419dfbb52e086",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -834,7 +834,7 @@
|
||||||
"sftp",
|
"sftp",
|
||||||
"storage"
|
"storage"
|
||||||
],
|
],
|
||||||
"time": "2015-07-28 20:41:58"
|
"time": "2015-09-05 12:06:41"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "monolog/monolog",
|
"name": "monolog/monolog",
|
||||||
|
|
|
@ -144,7 +144,7 @@ return [
|
||||||
App\Providers\EventServiceProvider::class,
|
App\Providers\EventServiceProvider::class,
|
||||||
App\Providers\RouteServiceProvider::class,
|
App\Providers\RouteServiceProvider::class,
|
||||||
|
|
||||||
// Intouch\LaravelNewrelic\LaravelNewrelicServiceProvider::class,
|
Intouch\LaravelNewrelic\NewrelicServiceProvider::class,
|
||||||
Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
|
Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
|
||||||
|
|
||||||
],
|
],
|
||||||
|
@ -195,7 +195,7 @@ return [
|
||||||
'Validator' => Illuminate\Support\Facades\Validator::class,
|
'Validator' => Illuminate\Support\Facades\Validator::class,
|
||||||
'View' => Illuminate\Support\Facades\View::class,
|
'View' => Illuminate\Support\Facades\View::class,
|
||||||
|
|
||||||
// 'Newrelic' => Intouch\LaravelNewrelic\Facades\Newrelic::class,
|
'Newrelic' => Intouch\LaravelNewrelic\Facades\Newrelic::class,
|
||||||
|
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|
42
config/newrelic.php
Normal file
42
config/newrelic.php
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
return array(
|
||||||
|
|
||||||
|
/*
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
| Default NewRelic Integration Settings
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Will automatically name transactions in NewRelic,
|
||||||
|
* using the Laravel route name, action or request.
|
||||||
|
*
|
||||||
|
* Set this to false to use the NewRelic default naming
|
||||||
|
* scheme, or to set your own in your application.
|
||||||
|
*/
|
||||||
|
'auto_name_transactions' => 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,
|
||||||
|
|
||||||
|
);
|
Loading…
Reference in a new issue