Refactor butler-health config

glesys · Sep 30, 2021 · e60f3e6 · e60f3e6
1 parent 2be304e
commit e60f3e6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Changed
+- Refactor butler-health config.
 - Refactor butler-audit config.
 - Merge package and application "butler" config.
 

diff --git a/config/butler.php b/config/butler.php
@@ -37,8 +37,6 @@
 
     'health' => [
 
-        'route' => false,
-
         'checks' => [],
 
     ],

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -133,7 +133,13 @@ protected function configureHealth()
             'butlerService' => ltrim(InstalledVersions::getPrettyVersion('glesys/butler-service'), 'v'),
         ]);
 
-        if (! $this->app->configurationIsCached() && config('butler.health.core', true)) {
+        if ($this->app->configurationIsCached()) {
+            return;
+        }
+
+        config(['butler.health.route' => false]);
+
+        if (config('butler.health.core', true)) {
             config([
                 'butler.health.checks' => array_merge([
                     HealthChecks\Database::class,

diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php
@@ -156,7 +156,7 @@ public function test_configureAudit_sets_initiator_resolver_for_unauthenticated_
             && $data->hasInitiatorContext('userAgent', 'Symfony'));
     }
 
-    public function test_health_is_configured()
+    public function test_configureHealth_configures_health()
     {
         $this->assertFalse(config('butler.health.route'));
 

diff --git a/tests/config/butler.php b/tests/config/butler.php
@@ -4,8 +4,6 @@
 
     'health' => [
 
-        'route' => false,
-
         'checks' => [
             Butler\Service\Tests\TestCheck::class,
         ],