diff --git a/app/Providers/HorizonServiceProvider.php b/app/Providers/HorizonServiceProvider.php index 3383835ee..a1e20ea50 100644 --- a/app/Providers/HorizonServiceProvider.php +++ b/app/Providers/HorizonServiceProvider.php @@ -20,6 +20,10 @@ class HorizonServiceProvider extends HorizonApplicationServiceProvider // Horizon::routeSmsNotificationsTo('15556667777'); // Horizon::routeMailNotificationsTo('example@example.com'); // Horizon::routeSlackNotificationsTo('slack-webhook-url', '#channel'); + + if(config('horizon.darkmode') == true) { + Horizon::night(); + } } /** @@ -36,15 +40,4 @@ class HorizonServiceProvider extends HorizonApplicationServiceProvider }); } - /** - * Register any application services. - * - * @return void - */ - public function register() - { - if(config('horizon.darkmode') == true) { - Horizon::night(); - } - } } diff --git a/composer.json b/composer.json index 44390e0fc..a6f762c93 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "intervention/image": "^2.4", "jenssegers/agent": "^2.6", "laravel/framework": "5.8.*", - "laravel/horizon": "^3.0", + "laravel/horizon": "^3.1", "laravel/passport": "^7.0", "laravel/tinker": "^1.0", "league/flysystem-aws-s3-v3": "~1.0", diff --git a/composer.lock b/composer.lock index a918756d9..637b8cc5e 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": "e7370fab05135d2b5e1161ccfc821f17", + "content-hash": "36dce3c2a72bd07cacbd5e9f38e568f4", "packages": [ { "name": "alchemy/binary-driver", @@ -71,16 +71,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.93.1", + "version": "3.93.3", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "2dce6e4b7295c6ea44392fc8eff421e3651a8725" + "reference": "874c1040edab52df3873157aa54ea51833d48c0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2dce6e4b7295c6ea44392fc8eff421e3651a8725", - "reference": "2dce6e4b7295c6ea44392fc8eff421e3651a8725", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/874c1040edab52df3873157aa54ea51833d48c0e", + "reference": "874c1040edab52df3873157aa54ea51833d48c0e", "shasum": "" }, "require": { @@ -150,7 +150,7 @@ "s3", "sdk" ], - "time": "2019-05-01T18:10:22+00:00" + "time": "2019-05-03T18:07:06+00:00" }, { "name": "beyondcode/laravel-self-diagnosis", @@ -2262,16 +2262,16 @@ }, { "name": "league/oauth2-server", - "version": "7.3.3", + "version": "7.4.0", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth2-server.git", - "reference": "c7f499849704ebe2c60b45b6d6bb231df5601d4a" + "reference": "2eb1cf79e59d807d89c256e7ac5e2bf8bdbd4acf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/c7f499849704ebe2c60b45b6d6bb231df5601d4a", - "reference": "c7f499849704ebe2c60b45b6d6bb231df5601d4a", + "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/2eb1cf79e59d807d89c256e7ac5e2bf8bdbd4acf", + "reference": "2eb1cf79e59d807d89c256e7ac5e2bf8bdbd4acf", "shasum": "" }, "require": { @@ -2335,7 +2335,7 @@ "secure", "server" ], - "time": "2019-03-29T18:19:35+00:00" + "time": "2019-05-05T09:22:01+00:00" }, { "name": "mobiledetect/mobiledetectlib", @@ -2724,16 +2724,16 @@ }, { "name": "opis/closure", - "version": "3.1.6", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "ccb8e3928c5c8181c76cdd0ed9366c5bcaafd91b" + "reference": "09b4389715a7eec100176ea58286649181753508" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/ccb8e3928c5c8181c76cdd0ed9366c5bcaafd91b", - "reference": "ccb8e3928c5c8181c76cdd0ed9366c5bcaafd91b", + "url": "https://api.github.com/repos/opis/closure/zipball/09b4389715a7eec100176ea58286649181753508", + "reference": "09b4389715a7eec100176ea58286649181753508", "shasum": "" }, "require": { @@ -2746,7 +2746,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "3.2.x-dev" } }, "autoload": { @@ -2781,7 +2781,7 @@ "serialization", "serialize" ], - "time": "2019-02-22T10:30:00+00:00" + "time": "2019-05-05T12:50:25+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -7168,16 +7168,16 @@ }, { "name": "sebastian/environment", - "version": "4.2.1", + "version": "4.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "3095910f0f0fb155ac4021fc51a4a7a39ac04e8a" + "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/3095910f0f0fb155ac4021fc51a4a7a39ac04e8a", - "reference": "3095910f0f0fb155ac4021fc51a4a7a39ac04e8a", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/f2a2c8e1c97c11ace607a7a667d73d47c19fe404", + "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404", "shasum": "" }, "require": { @@ -7217,7 +7217,7 @@ "environment", "hhvm" ], - "time": "2019-04-25T07:55:20+00:00" + "time": "2019-05-05T09:05:15+00:00" }, { "name": "sebastian/exporter", diff --git a/config/app.php b/config/app.php index 5aa786fbe..cc83ca8c7 100644 --- a/config/app.php +++ b/config/app.php @@ -158,6 +158,7 @@ return [ App\Providers\AppServiceProvider::class, App\Providers\AuthServiceProvider::class, // App\Providers\BroadcastServiceProvider::class, + App\Providers\HorizonServiceProvider::class, App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, diff --git a/config/horizon.php b/config/horizon.php index 0f6cf76f7..01ae01e19 100644 --- a/config/horizon.php +++ b/config/horizon.php @@ -2,6 +2,32 @@ return [ + /* + |-------------------------------------------------------------------------- + | Horizon Domain + |-------------------------------------------------------------------------- + | + | This is the subdomain where Horizon will be accessible from. If this + | setting is null, Horizon will reside under the same domain as the + | application. Otherwise, this value will serve as the subdomain. + | + */ + + 'domain' => 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 @@ -28,6 +54,19 @@ return [ 'prefix' => env('HORIZON_PREFIX', 'horizon-'.str_random(8).':'), + /* + |-------------------------------------------------------------------------- + | 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 @@ -61,6 +100,34 @@ return [ 'failed' => 10080, ], + /* + |-------------------------------------------------------------------------- + | 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