diff --git a/modules/Profiler/Config/config.php b/modules/Profiler/Config/config.php deleted file mode 100644 index 6d01f49e..00000000 --- a/modules/Profiler/Config/config.php +++ /dev/null @@ -1,12 +0,0 @@ - 'Profiler', - 'translatedName' => 'profiler::module.name', - 'translatedDescription' => 'profiler::module.description', - 'alias' => 'profiler', - 'handler' => \Modules\Profiler\Handlers\ProfileHandler::class, - 'providers' => [\Modules\Profiler\Providers\ProfilerServiceProvider::class], - 'files' => ['start.php'], - 'order' => -100, -]; \ No newline at end of file diff --git a/modules/Profiler/Database/Migrations/2017_02_22_014824_create_queries_log_table.php b/modules/Profiler/Database/Migrations/2017_02_22_014824_create_queries_log_table.php deleted file mode 100644 index 754e1866..00000000 --- a/modules/Profiler/Database/Migrations/2017_02_22_014824_create_queries_log_table.php +++ /dev/null @@ -1,33 +0,0 @@ -increments('id'); - $table->timestamps(); - $table->text('query'); - $table->text('bindings'); - $table->double('time'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('queries_log'); - } -} diff --git a/modules/Profiler/Database/Migrations/2017_02_22_021253_create_http_log_table.php b/modules/Profiler/Database/Migrations/2017_02_22_021253_create_http_log_table.php deleted file mode 100644 index 77b44cc4..00000000 --- a/modules/Profiler/Database/Migrations/2017_02_22_021253_create_http_log_table.php +++ /dev/null @@ -1,35 +0,0 @@ -increments('id'); - $table->timestamps(); - $table->string('method'); - $table->text('url'); - $table->double('time'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::drop('http_log'); - } - -} diff --git a/modules/Profiler/Database/Migrations/2017_03_02_114429_update_http_log_add_load_avg.php b/modules/Profiler/Database/Migrations/2017_03_02_114429_update_http_log_add_load_avg.php deleted file mode 100644 index 086f727b..00000000 --- a/modules/Profiler/Database/Migrations/2017_03_02_114429_update_http_log_add_load_avg.php +++ /dev/null @@ -1,35 +0,0 @@ -double('load_1')->nullable(); - $table->double('load_5')->nullable(); - $table->double('load_15')->nullable(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('http_log', function (Blueprint $table) { - $table->dropColumn('load_1'); - $table->dropColumn('load_5'); - $table->dropColumn('load_15'); - }); - } -} diff --git a/modules/Profiler/Database/Migrations/2017_03_02_115241_update_query_log_add_request_id.php b/modules/Profiler/Database/Migrations/2017_03_02_115241_update_query_log_add_request_id.php deleted file mode 100644 index b7ef557e..00000000 --- a/modules/Profiler/Database/Migrations/2017_03_02_115241_update_query_log_add_request_id.php +++ /dev/null @@ -1,43 +0,0 @@ -integer('http_log_id') - ->nullable() - ->unsigned() - ->after('id') - ->comment('FK to http_log'); - - $table->foreign('http_log_id') - ->references('id') - ->on('http_log') - ->onDelete('cascade') - ->onUpdate('cascade'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('queries_log', function (Blueprint $table) { - - // $table->dropForeign(''); - $table->dropColumn('http_log_id'); - }); - } -} diff --git a/modules/Profiler/Database/Seeders/.gitkeep b/modules/Profiler/Database/Seeders/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/modules/Profiler/Database/Seeders/ProfilerDatabaseSeeder.php b/modules/Profiler/Database/Seeders/ProfilerDatabaseSeeder.php deleted file mode 100644 index b618393b..00000000 --- a/modules/Profiler/Database/Seeders/ProfilerDatabaseSeeder.php +++ /dev/null @@ -1,20 +0,0 @@ -call("OthersTableSeeder"); - } - -} \ No newline at end of file diff --git a/modules/Profiler/Entities/HttpLog.php b/modules/Profiler/Entities/HttpLog.php deleted file mode 100644 index cb6f3603..00000000 --- a/modules/Profiler/Entities/HttpLog.php +++ /dev/null @@ -1,22 +0,0 @@ -hasMany(QueryLog::class); - } -} \ No newline at end of file diff --git a/modules/Profiler/Entities/QueryLog.php b/modules/Profiler/Entities/QueryLog.php deleted file mode 100644 index e458bcd3..00000000 --- a/modules/Profiler/Entities/QueryLog.php +++ /dev/null @@ -1,23 +0,0 @@ - 'array' - ]; - - public function httpLog() - { - return $this->belongsTo(HttpLog::class); - } -} \ No newline at end of file diff --git a/modules/Profiler/Handlers/ProfileHandler.php b/modules/Profiler/Handlers/ProfileHandler.php deleted file mode 100644 index 0fec0ab6..00000000 --- a/modules/Profiler/Handlers/ProfileHandler.php +++ /dev/null @@ -1,25 +0,0 @@ -whereTitle(trans('admin/mainMenu.system')); - $submenu->route('profiler.index', trans('profiler::module.name'), [], 10, ['icon' => 'fa fa-dashboard']); - } -} \ No newline at end of file diff --git a/modules/Profiler/Http/Controllers/ProfilerController.php b/modules/Profiler/Http/Controllers/ProfilerController.php deleted file mode 100644 index 8aca7beb..00000000 --- a/modules/Profiler/Http/Controllers/ProfilerController.php +++ /dev/null @@ -1,67 +0,0 @@ -= 0) { - $httpLog = $httpLog->where('created_at', '>=', Carbon::today() - ->subDays($pastDays)); - } - - session(['profilerPastDays' => $pastDays]); - - if (Input::get('method')) { - $filters[] = 'method'; - $httpLog = $httpLog->where('method', Input::get('method')); - } - - $displayGrouped = false; - - if (Input::get('url')) { - $httpLog = $httpLog->where('url', Input::get('url')) - ->orderBy('created_at', 'DESC') - ->with('queries'); - } else { - $displayGrouped = true; - $httpLog = $httpLog->groupBy('url', 'method') - ->select(\DB::raw('*'), \DB::raw('COUNT(url) as total'), \DB::raw('AVG(time) as time_avg')) - ->orderBy('total', 'DESC'); - } - - $httpLog = $httpLog->paginate(25); - - $filter = Input::all(); - return view('profiler::index', compact('httpLog', 'displayGrouped', 'filter', 'pastDays')); - } - - public function destroy() - { - $older = Input::get('olderThan'); - - if (is_null($older)) { - \DB::statement("SET foreign_key_checks=0"); - QueryLog::truncate(); - HttpLog::truncate(); - \DB::statement("SET foreign_key_checks=1"); - } else { - HttpLog::where('created_at', '<=', Carbon::now() - ->subDays($older)) - ->delete(); - } - - return redirect() - ->back() - ->with('success', trans('profiler::module.succesfullyDeleted')); - } -} \ No newline at end of file diff --git a/modules/Profiler/Http/Controllers/QueryController.php b/modules/Profiler/Http/Controllers/QueryController.php deleted file mode 100644 index b19af8fc..00000000 --- a/modules/Profiler/Http/Controllers/QueryController.php +++ /dev/null @@ -1,13 +0,0 @@ -queries; - - return view('profiler::queries.index', compact('queries')); - } -} \ No newline at end of file diff --git a/modules/Profiler/Http/Controllers/RequestController.php b/modules/Profiler/Http/Controllers/RequestController.php deleted file mode 100644 index 56c734d5..00000000 --- a/modules/Profiler/Http/Controllers/RequestController.php +++ /dev/null @@ -1,37 +0,0 @@ -url) - ->where('method', $httpLog->method); - - $pastDays = Input::get('pastDays', session('profilerPastDays', 0)); - if (is_numeric($pastDays) && $pastDays >= 0) { - $sameRequests = $sameRequests->where('created_at', '>=', Carbon::today() - ->subDays($pastDays)); - } - - session(['profilerPastDays' => $pastDays]); - - $sameRequests = $sameRequests->get(); - - $times = [ - 'avg' => $sameRequests->avg('time'), - 'min' => $sameRequests->min('time'), - 'max' => $sameRequests->max('time') - ]; - - $filter = Input::all(); - - return view('profiler::request.detail', compact('httpLog', 'sameRequests', 'times', 'pastDays', 'filter')); - } -} \ No newline at end of file diff --git a/modules/Profiler/Http/Middleware/.gitkeep b/modules/Profiler/Http/Middleware/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/modules/Profiler/Http/Requests/.gitkeep b/modules/Profiler/Http/Requests/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/modules/Profiler/Http/routes.php b/modules/Profiler/Http/routes.php deleted file mode 100644 index b64505b3..00000000 --- a/modules/Profiler/Http/routes.php +++ /dev/null @@ -1,23 +0,0 @@ - LaravelLocalization::setLocale(), - 'namespace' => 'Modules\Profiler\Http\Controllers' - ], function () { - Route::group([ - 'middleware' => ['admin'], - 'prefix' => 'admin/profiler' - ], function () { - - Route::get('/', 'ProfilerController@index') - ->name('profiler.index'); - - Route::get('{httpLog}', 'RequestController@detail') - ->name('request.detail'); - - Route::get('{httpLog}/queries', 'QueryController@index') - ->name('queries.index'); - - Route::get('delete/all', 'ProfilerController@destroy') - ->name('profiler.deleteAll'); - }); -}); \ No newline at end of file diff --git a/modules/Profiler/Middleware/Profiler.php b/modules/Profiler/Middleware/Profiler.php deleted file mode 100644 index 01268027..00000000 --- a/modules/Profiler/Middleware/Profiler.php +++ /dev/null @@ -1,64 +0,0 @@ -queries = \DB::getQueryLog(); - - $requestId = $this->logRequest($request); - $this->logQueries($requestId); - } - - /** - * - * - * @param Request $request - * - * @return mixed - */ - protected function logRequest(Request $request) - { - $url = $request->fullUrl(); - $method = $request->getMethod(); - $time = (microtime(true) - LARAVEL_START) * 1000; - - $data = ['url' => $url, 'method' => $method, 'time' => $time]; - - if (function_exists('sys_getloadavg')) { - $load = sys_getloadavg(); - $data['load_1'] = $load[0]; - $data['load_5'] = $load[1]; - $data['load_15'] = $load[2]; - } - - $http = HttpLog::create($data); - - return $http->id; - } - - protected function logQueries($httpLogId = null) - { - foreach ($this->queries as $query) { - QueryLog::create([ - 'query' => $query['query'], - 'bindings' => $query['bindings'], - 'time' => $query['time'], - 'http_log_id' => $httpLogId - ]); - } - } -} \ No newline at end of file diff --git a/modules/Profiler/Providers/ProfilerEventServiceProvider.php b/modules/Profiler/Providers/ProfilerEventServiceProvider.php deleted file mode 100644 index 707b75ce..00000000 --- a/modules/Profiler/Providers/ProfilerEventServiceProvider.php +++ /dev/null @@ -1,8 +0,0 @@ -alias = 'profiler'; - } - - /** - * Boot the application events. - * - * @return void - */ - public function boot() - { - parent::boot(); - - $this->app->register(ProfilerEventServiceProvider::class); - } - - public function register() - { - parent::register(); - - // register settings form - $registrator = $this->app->make('registerSettingsExtension'); - $registrator->register('profiler', 'profiler::module.name', 'profiler::settings.profiler'); - - // turn on profiler for visitor area (middleware group "web") - if (setting('useProfilerInVisitorArea', true)) { - $this->app['router']->prependMiddlewareToGroup('web', Profiler::class); - } - - // use profiler also in admin? - if (setting('useProfilerInAdmin', true)) { - $this->app['router']->prependMiddlewareToGroup('admin', Profiler::class); - } - } - - protected function setModulePath() - { - $this->path = __DIR__; - } -} \ No newline at end of file diff --git a/modules/Profiler/Repositories/.gitkeep b/modules/Profiler/Repositories/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/modules/Profiler/Resources/lang/cs/module.php b/modules/Profiler/Resources/lang/cs/module.php deleted file mode 100644 index c3b34536..00000000 --- a/modules/Profiler/Resources/lang/cs/module.php +++ /dev/null @@ -1,44 +0,0 @@ - 'Profiler', - 'index' => [ - 'createdAt' => 'Datum', - 'httpMethod' => 'HTTP metoda', - 'url' => 'URL', - 'time' => 'Čas', - 'timeAvg' => 'Průměrný čas', - 'timeMin' => 'Minimální čas', - 'timeMax' => 'Maximální čas', - 'systemLoad' => 'Load serveru', - 'calledTotal' => 'Volání', - 'pastDays' => [ - 'today' => 'Dnes', - 'overall' => 'Vše', - 'days' => '1 den|:count dny|:count dní' - ] - ], - 'settings' => [ - 'useProfilerInVisitorArea' => 'Zapnout měření ve veřejné části?', - 'useProfilerInAdmin' => 'Zapnout měření v administraci?' - ], - 'request' => [ - 'info' => 'Detaily requestu', - 'sql' => 'SQL dotazy', - 'detail' => 'Detail požadavku', - 'sameRequests' => 'Ostatní volání' - ], - 'graphs' => [ - 'responseTime' => 'Doba odezvy' - ], - 'queries' => [ - 'sql' => 'SQL dotaz', - 'time' => 'Čas dotazu' - ], - 'listDescription' => 'Seznam HTTP požadavků na tuto aplikaci.', - 'groupedListDescription' => 'Seznam HTTP požadavků na tuto aplikaci.', - 'requestDetail' => 'Detail HTTP požadavku', - 'deleteAllData' => 'Smazat všechna data', - 'deleteOld' => 'Smazat data starší než 30 dní', - 'succesfullyDeleted' => 'Úspěšně vymazána data z profileru.', - -]; \ No newline at end of file diff --git a/modules/Profiler/Resources/views/_partials/groupedRequestList.blade.php b/modules/Profiler/Resources/views/_partials/groupedRequestList.blade.php deleted file mode 100644 index 90cadf31..00000000 --- a/modules/Profiler/Resources/views/_partials/groupedRequestList.blade.php +++ /dev/null @@ -1,31 +0,0 @@ -@if(count($requests) > 0) - - - - - - - - - - - - @foreach($requests as $request) - - - - - - - - @endforeach - -
@lang('profiler::module.index.calledTotal')@lang('profiler::module.index.httpMethod')@lang('profiler::module.index.url')@lang('profiler::module.index.timeAvg')
{{$request->total}}{{$request->method}}{{$request->url}}{{number_format($request->time_avg, 2)}} ms - - - -
-@else - @lang('admin/common.empty') -@endif \ No newline at end of file diff --git a/modules/Profiler/Resources/views/_partials/requestList.blade.php b/modules/Profiler/Resources/views/_partials/requestList.blade.php deleted file mode 100644 index f578b00d..00000000 --- a/modules/Profiler/Resources/views/_partials/requestList.blade.php +++ /dev/null @@ -1,60 +0,0 @@ -@if(count($requests) > 0) - - - - - - - - - - - - - - - @foreach($requests as $request) - - - - - - - - - @endforeach - -
@lang('profiler::module.index.createdAt')@lang('profiler::module.index.httpMethod')@lang('profiler::module.index.url')@lang('profiler::module.index.time')@lang('profiler::module.index.systemLoad')
{{$request->created_at->format('d.m.Y G:i')}}{{$request->method}}{{$request->url}}{{number_format($request->time, 3)}} ms{{$request->load_1}}, {{$request->load_5}}, {{$request->load_15}} - -
- - - - - - - - -
- -
-
- - -
- -@else - @lang('admin/common.empty') -@endif \ No newline at end of file diff --git a/modules/Profiler/Resources/views/index.blade.php b/modules/Profiler/Resources/views/index.blade.php deleted file mode 100644 index f59f90a8..00000000 --- a/modules/Profiler/Resources/views/index.blade.php +++ /dev/null @@ -1,44 +0,0 @@ -@extends('admin.layoutWithNavigation') - -@section('pageHeading', trans('profiler::module.name')) - -@section('headerButtons') - @if($displayGrouped == false) - - - - @endif - -
- @foreach(['0' => 'today', '7' => 'days', '30' => 'days', 'inf' => 'overall'] as $pastDay => $name) - @php $filter['pastDays'] = $pastDay; @endphp - - {{trans_choice('profiler::module.index.pastDays.'.$name, $pastDay)}} - @endforeach -
- -@endsection - -@if($displayGrouped == false) - @section('pageDescription', trans('profiler::module.listDescription')) -@else - @section('pageDescription', trans('profiler::module.groupedListDescription')) -@endif - -@section('content') - -
-
- - @if ($displayGrouped == true) - @include('profiler::_partials.groupedRequestList', ['requests' => $httpLog]) - @else - @include('profiler::_partials.requestList', ['requests' => $httpLog]) - @endif -
- -
-@endsection \ No newline at end of file diff --git a/modules/Profiler/Resources/views/queries/index.blade.php b/modules/Profiler/Resources/views/queries/index.blade.php deleted file mode 100644 index 2da5e5eb..00000000 --- a/modules/Profiler/Resources/views/queries/index.blade.php +++ /dev/null @@ -1,41 +0,0 @@ -@extends('admin.layoutWithNavigation') - -@section('pageHeading', trans('profiler::module.name')) - -@section('content') - -
-
- - - - - - - - - - - - @foreach($queries as $query) - - - - - @endforeach - -
@lang('profiler::module.queries.sql')@lang('profiler::module.queries.time')
- @php $sql = $query->query; @endphp - @foreach($query->bindings as $value) - @php - if (is_array($value) && isset($value['date'])) - {$value = \Carbon\Carbon::parse($value['date'])->toDateTimeString();} - $sql = preg_replace('/\?/', $value, $sql, 1); - @endphp - @endforeach - - {{$sql}} - {{number_format($query->time, 3)}} ms
-
-
-@endsection \ No newline at end of file diff --git a/modules/Profiler/Resources/views/request/detail.blade.php b/modules/Profiler/Resources/views/request/detail.blade.php deleted file mode 100644 index 850194bf..00000000 --- a/modules/Profiler/Resources/views/request/detail.blade.php +++ /dev/null @@ -1,111 +0,0 @@ -@extends('admin.layoutWithNavigation') - -@section('pageHeading', trans('profiler::module.requestDetail')) - -@section('headerButtons') - -
- @foreach(['0' => 'today', '7' => 'days', '30' => 'days', 'inf' => 'overall'] as $pastDay => $name) - @php $filter['httpLog'] = $httpLog ;$filter['pastDays'] = $pastDay; @endphp - - {{trans_choice('profiler::module.index.pastDays.'.$name, $pastDay)}} - @endforeach -
- -@endsection - - -@section('content') - -
-
-
-
-
-

@lang('profiler::module.request.detail')

-
-
- -
-
-
    -
  • @lang('profiler::module.index.httpMethod'): {{$httpLog->method}}
  • -
  • @lang('profiler::module.index.url'): {{$httpLog->url}} -
  • -
  • @lang('profiler::module.index.time'): {{number_format($httpLog->time, 2)}} ms
  • -
  • @lang('profiler::module.index.systemLoad'): {{$httpLog->load_1}}, {{$httpLog->load_5}} - , {{$httpLog->load_15}}
  • -
-
- -
-
- {{count($sameRequests)}} ×
@lang('profiler::module.index.calledTotal')
-
{{number_format($times['min'], 2)}} - ms
@lang('profiler::module.index.timeMin')
-
{{number_format($times['max'], 2)}} - ms
@lang('profiler::module.index.timeMax')
-
{{number_format($times['avg'], 2)}} - ms
@lang('profiler::module.index.timeAvg')
-
-
-
-
- -
-
-
-
-

@lang('profiler::module.graphs.responseTime')

-
-
-
- -
-
-
-
- -
-
-
-

@lang('profiler::module.request.sameRequests')

-
-
- -
- @include('profiler::_partials.requestList', ['requests' => $sameRequests]) -
-
- - -@endsection - -@section('javascripts') - -@endsection \ No newline at end of file diff --git a/modules/Profiler/Resources/views/settings/profiler.blade.php b/modules/Profiler/Resources/views/settings/profiler.blade.php deleted file mode 100644 index 8cf845e5..00000000 --- a/modules/Profiler/Resources/views/settings/profiler.blade.php +++ /dev/null @@ -1,65 +0,0 @@ -
-
- - @php $profileVisitorArea = old('useProfilerInVisitorArea', isset($settings->useProfilerInVisitorArea) ? $settings->useProfilerInVisitorArea['val'] : null); @endphp - - @lang('profiler::module.settings.useProfilerInVisitorArea') - - - - -
-
- @include('admin.settings.snippets.commonSettings', ['field' => 'useProfilerInVisitorArea']) -
-
- -
-
- @php $profileAdmin = old('useProfilerInAdmin', isset($settings->useProfilerInAdmin) ? $settings->useProfilerInAdmin['val'] : false); @endphp - @lang('profiler::module.settings.useProfilerInAdmin') - - - - -
-
- @include('admin.settings.snippets.commonSettings', ['field' => 'useProfilerInAdmin']) -
-
- -
- - @lang('profiler::module.deleteAllData') - - - - @lang('profiler::module.deleteOld') - -
- - - - - - diff --git a/modules/Profiler/composer.json b/modules/Profiler/composer.json deleted file mode 100644 index d191be60..00000000 --- a/modules/Profiler/composer.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "pingpong-modules/profiler", - "description": "", - "authors": [ - { - "name": "Pingpong Labs", - "email": "pingpong.labs@gmail.com" - } - ], - "autoload": { - "psr-4": { - "Modules\\Profiler\\": "" - } - } -} \ No newline at end of file diff --git a/modules/Profiler/start.php b/modules/Profiler/start.php deleted file mode 100644 index 7be329cb..00000000 --- a/modules/Profiler/start.php +++ /dev/null @@ -1,15 +0,0 @@ -