From a56b84551682ba3a7cd1d287b39873d12ba2c12e Mon Sep 17 00:00:00 2001 From: Romulus21 Date: Fri, 11 Sep 2020 18:45:37 +0200 Subject: [PATCH] clean horizon & redis --- .idea/php.xml | 1 - .idea/portal.iml | 1 - app/Providers/HorizonServiceProvider.php | 42 ----- composer.json | 1 - composer.lock | 95 ++--------- config/app.php | 1 - config/horizon.php | 193 ----------------------- 7 files changed, 11 insertions(+), 323 deletions(-) delete mode 100644 app/Providers/HorizonServiceProvider.php delete mode 100644 config/horizon.php diff --git a/.idea/php.xml b/.idea/php.xml index 38bd178..077cc7d 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -121,7 +121,6 @@ - diff --git a/.idea/portal.iml b/.idea/portal.iml index a46aafe..6d96231 100644 --- a/.idea/portal.iml +++ b/.idea/portal.iml @@ -30,7 +30,6 @@ - diff --git a/app/Providers/HorizonServiceProvider.php b/app/Providers/HorizonServiceProvider.php deleted file mode 100644 index 66fcc2e..0000000 --- a/app/Providers/HorizonServiceProvider.php +++ /dev/null @@ -1,42 +0,0 @@ -email, [ - 'romain@delanoe.me', 'test@rodev.fr' - ]); - }); - } -} diff --git a/composer.json b/composer.json index 593febc..6983ee4 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,6 @@ "guzzlehttp/guzzle": "^7.0.1", "intervention/image": "^2.5", "laravel/framework": "^8.0", - "laravel/horizon": "^5.0", "laravel/passport": "^10.0", "laravel/tinker": "^2.0", "laravel/ui": "^2.0" diff --git a/composer.lock b/composer.lock index 1e07b53..6c99359 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4540d4ed3980d029b2338e3470bbe158", + "content-hash": "5eb5309302a9537ceba55622220336a9", "packages": [ { "name": "asm89/stack-cors", @@ -1161,79 +1161,6 @@ ], "time": "2020-09-08T15:15:32+00:00" }, - { - "name": "laravel/horizon", - "version": "v5.0.0", - "source": { - "type": "git", - "url": "https://github.com/laravel/horizon.git", - "reference": "1093218e2bad6a5037389a72b4ecef19af763c10" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/1093218e2bad6a5037389a72b4ecef19af763c10", - "reference": "1093218e2bad6a5037389a72b4ecef19af763c10", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-pcntl": "*", - "ext-posix": "*", - "illuminate/contracts": "^8.0", - "illuminate/queue": "^8.0", - "illuminate/support": "^8.0", - "nesbot/carbon": "^2.17", - "php": "^7.3", - "ramsey/uuid": "^4.0", - "symfony/error-handler": "^5.0", - "symfony/process": "^5.0" - }, - "require-dev": { - "mockery/mockery": "^1.0", - "orchestra/testbench": "^6.0", - "phpunit/phpunit": "^9.0", - "predis/predis": "^1.1" - }, - "suggest": { - "ext-redis": "Required to use the Redis PHP driver.", - "predis/predis": "Required when not using the Redis PHP driver (^1.1)." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - }, - "laravel": { - "providers": [ - "Laravel\\Horizon\\HorizonServiceProvider" - ], - "aliases": { - "Horizon": "Laravel\\Horizon\\Horizon" - } - } - }, - "autoload": { - "psr-4": { - "Laravel\\Horizon\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "Dashboard and code-driven configuration for Laravel queues.", - "keywords": [ - "laravel", - "queue" - ], - "time": "2020-09-08T15:23:07+00:00" - }, { "name": "laravel/passport", "version": "v10.0.0", @@ -1953,16 +1880,16 @@ }, { "name": "nesbot/carbon", - "version": "2.39.1", + "version": "2.39.2", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "7af467873250583cc967a59ee9df29fabab193c1" + "reference": "326efde1bc09077a26cb77f6e2e32e13f06c27f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7af467873250583cc967a59ee9df29fabab193c1", - "reference": "7af467873250583cc967a59ee9df29fabab193c1", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/326efde1bc09077a26cb77f6e2e32e13f06c27f2", + "reference": "326efde1bc09077a26cb77f6e2e32e13f06c27f2", "shasum": "" }, "require": { @@ -2038,7 +1965,7 @@ "type": "tidelift" } ], - "time": "2020-09-04T13:11:37+00:00" + "time": "2020-09-10T12:16:42+00:00" }, { "name": "nikic/php-parser", @@ -2946,16 +2873,16 @@ }, { "name": "ramsey/collection", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/ramsey/collection.git", - "reference": "044184884e3c803e4cbb6451386cb71562939b18" + "reference": "24d93aefb2cd786b7edd9f45b554aea20b28b9b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/collection/zipball/044184884e3c803e4cbb6451386cb71562939b18", - "reference": "044184884e3c803e4cbb6451386cb71562939b18", + "url": "https://api.github.com/repos/ramsey/collection/zipball/24d93aefb2cd786b7edd9f45b554aea20b28b9b1", + "reference": "24d93aefb2cd786b7edd9f45b554aea20b28b9b1", "shasum": "" }, "require": { @@ -3011,7 +2938,7 @@ "type": "github" } ], - "time": "2020-08-11T00:57:21+00:00" + "time": "2020-09-10T20:58:17+00:00" }, { "name": "ramsey/uuid", diff --git a/config/app.php b/config/app.php index d7cbf51..633c142 100644 --- a/config/app.php +++ b/config/app.php @@ -173,7 +173,6 @@ return [ App\Providers\AuthServiceProvider::class, // App\Providers\BroadcastServiceProvider::class, App\Providers\EventServiceProvider::class, - App\Providers\HorizonServiceProvider::class, App\Providers\RouteServiceProvider::class, ], diff --git a/config/horizon.php b/config/horizon.php deleted file mode 100644 index edc054f..0000000 --- a/config/horizon.php +++ /dev/null @@ -1,193 +0,0 @@ - null, - - /* - |-------------------------------------------------------------------------- - | Horizon Path - |-------------------------------------------------------------------------- - | - | This is the URI path where Horizon will be accessible from. Feel free - | to change this path to anything you like. Note that the URI will not - | affect the paths of its internal API that aren't exposed to users. - | - */ - - 'path' => 'horizon', - - /* - |-------------------------------------------------------------------------- - | Horizon Redis Connection - |-------------------------------------------------------------------------- - | - | This is the name of the Redis connection where Horizon will store the - | meta information required for it to function. It includes the list - | of supervisors, failed jobs, job metrics, and other information. - | - */ - - 'use' => 'default', - - /* - |-------------------------------------------------------------------------- - | Horizon Redis Prefix - |-------------------------------------------------------------------------- - | - | This prefix will be used when storing all Horizon data in Redis. You - | may modify the prefix when you are running multiple installations - | of Horizon on the same server so that they don't have problems. - | - */ - - 'prefix' => env( - 'HORIZON_PREFIX', - Str::slug(env('APP_NAME', 'laravel'), '_').'_horizon:' - ), - - /* - |-------------------------------------------------------------------------- - | Horizon Route Middleware - |-------------------------------------------------------------------------- - | - | These middleware will get attached onto each Horizon route, giving you - | the chance to add your own middleware to this list or change any of - | the existing middleware. Or, you can simply stick with this list. - | - */ - - 'middleware' => ['web'], - - /* - |-------------------------------------------------------------------------- - | Queue Wait Time Thresholds - |-------------------------------------------------------------------------- - | - | This option allows you to configure when the LongWaitDetected event - | will be fired. Every connection / queue combination may have its - | own, unique threshold (in seconds) before this event is fired. - | - */ - - 'waits' => [ - 'redis:default' => 60, - ], - - /* - |-------------------------------------------------------------------------- - | Job Trimming Times - |-------------------------------------------------------------------------- - | - | Here you can configure for how long (in minutes) you desire Horizon to - | persist the recent and failed jobs. Typically, recent jobs are kept - | for one hour while all failed jobs are stored for an entire week. - | - */ - - 'trim' => [ - 'recent' => 60, - 'pending' => 60, - 'completed' => 60, - 'recent_failed' => 10080, - 'failed' => 10080, - 'monitored' => 10080, - ], - - /* - |-------------------------------------------------------------------------- - | Metrics - |-------------------------------------------------------------------------- - | - | Here you can configure how many snapshots should be kept to display in - | the metrics graph. This will get used in combination with Horizon's - | `horizon:snapshot` schedule to define how long to retain metrics. - | - */ - - 'metrics' => [ - 'trim_snapshots' => [ - 'job' => 24, - 'queue' => 24, - ], - ], - - /* - |-------------------------------------------------------------------------- - | Fast Termination - |-------------------------------------------------------------------------- - | - | When this option is enabled, Horizon's "terminate" command will not - | wait on all of the workers to terminate unless the --wait option - | is provided. Fast termination can shorten deployment delay by - | allowing a new instance of Horizon to start while the last - | instance will continue to terminate each of its workers. - | - */ - - 'fast_termination' => false, - - /* - |-------------------------------------------------------------------------- - | Memory Limit (MB) - |-------------------------------------------------------------------------- - | - | This value describes the maximum amount of memory the Horizon worker - | may consume before it is terminated and restarted. You should set - | this value according to the resources available to your server. - | - */ - - 'memory_limit' => 64, - - /* - |-------------------------------------------------------------------------- - | Queue Worker Configuration - |-------------------------------------------------------------------------- - | - | Here you may define the queue worker settings used by your application - | in all environments. These supervisors and settings handle all your - | queued jobs and will be provisioned by Horizon during deployment. - | - */ - - 'defaults' => [ - 'supervisor-1' => [ - 'connection' => 'redis', - 'queue' => ['default'], - 'balance' => 'auto', - 'maxProcesses' => 1, - 'tries' => 1, - 'nice' => 0, - ], - ], - - 'environments' => [ - 'production' => [ - 'supervisor-1' => [ - 'maxProcesses' => 10, - 'balanceMaxShift' => 1, - 'balanceCooldown' => 3, - ], - ], - - 'local' => [ - 'supervisor-1' => [ - 'maxProcesses' => 3, - ], - ], - ], -];