Allow disabling notifications by the caller

antonioribeiro · Nov 23, 2022 · 5ae947d · 5ae947d
1 parent 9514d32
commit 5ae947d
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 5 deletions.
diff --git a/src/Http/Controllers/Health.php b/src/Http/Controllers/Health.php
@@ -23,6 +23,8 @@ class Health extends Controller
     public function __construct(Service $healthService)
     {
         $this->healthService = $healthService;
+
+        $this->healthService->setCaller('web');
     }
 
     /**

diff --git a/src/Service.php b/src/Service.php
@@ -169,4 +169,14 @@ public function string(?string $filters = '')
                 );
         });
     }
+
+    /**
+     * Set the caller.
+     *
+     * @param string $caller
+     */
+    public function setCaller($caller)
+    {
+        $this->resourceChecker->setCurrentCaller($caller);
+    }
 }
diff --git a/src/Support/Resource.php b/src/Support/Resource.php
@@ -80,6 +80,11 @@ class Resource implements JsonSerializable
      */
     protected $currentAction;
 
+    /**
+     * @var string
+     */
+    protected $currentCaller;
+
     /**
      * @var bool|null
      */
@@ -195,11 +200,14 @@ public function instantiateChecker(string $checker)
      * Check all targets for a resource.
      *
      * @param  string  $action
+     * @param  string  $caller
      * @return resource
      */
-    public function check($action = 'resource')
+    public function check($action = 'resource', $caller = 'console')
     {
-        $this->setCurrentAction($action)->targets->each(function (
+        $this->setCurrentAction($action)
+             ->setCurrentCaller($caller)
+            ->targets->each(function (
             Target $target
         ) {
             $target->check($target);
@@ -312,7 +320,8 @@ protected function notificationsAreEnabled()
         return
             $this->notify &&
             config('health.notifications.enabled') &&
-            config('health.notifications.notify_on.'.$this->currentAction);
+            config('health.notifications.notify_on.'.$this->currentAction) &&
+            config('health.notifications.notify_from.'.$this->currentCaller, true);
     }
 
     /**
@@ -328,6 +337,19 @@ public function setCurrentAction(string $currentAction)
         return $this;
     }
 
+    /**
+     * Set current caller.
+     *
+     * @param  string  $currentCaller
+     * @return resource
+     */
+    public function setCurrentCaller(string $currentCaller)
+    {
+        $this->currentCaller = $currentCaller;
+
+        return $this;
+    }
+
     /**
      * Resources setter.
      *

diff --git a/src/Support/ResourceChecker.php b/src/Support/ResourceChecker.php
@@ -22,6 +22,13 @@ class ResourceChecker
      */
     protected $currentAction = 'check';
 
+    /**
+     * The current caller.
+     *
+     * @var string
+     */
+    protected $currentCaller = 'console';
+
     /**
      * All resources.
      *
@@ -57,6 +64,11 @@ class ResourceChecker
      */
     protected $resourceLoader;
 
+    /**
+     * @var boolean
+     */
+    protected $disableNotifications = false;
+
     /**
      * ResourceChecker constructor.
      *
@@ -123,7 +135,7 @@ public function checkResource($resource)
         $checked = $this->cache->remember($resource->slug, function () use (
             $resource
         ) {
-            return $resource->check($this->getCurrentAction());
+            return $resource->check($this->getCurrentAction(), $this->getCurrentCaller());
         });
 
         $resource->targets = $checked->targets;
@@ -162,6 +174,16 @@ public function getCurrentAction()
         return $this->currentAction;
     }
 
+    /**
+     * Get current caller.
+     *
+     * @return string
+     */
+    public function getCurrentCaller()
+    {
+        return $this->currentCaller;
+    }
+
     /**
      * Get all non global resources.
      *
@@ -271,6 +293,16 @@ public function setCurrentAction($currentAction)
         $this->currentAction = $currentAction;
     }
 
+    /**
+     * Set the current caller.
+     *
+     * @param string $currentCaller
+     */
+    public function setCurrentCaller($currentCaller)
+    {
+        $this->currentCaller = $currentCaller;
+    }
+
     /**
      * Resources setter.
      *

diff --git a/src/config/health.php b/src/config/health.php
@@ -197,6 +197,11 @@
             'resource' => false,
         ],
 
+        'notify_from' => [
+            'web' => false,
+            'console' => true,
+        ],
+
         'subject' => 'Health Status',
 
         'action-title' => 'View App Health',
@@ -218,7 +223,7 @@
         ],
 
         'users' => [
-            'model' => App\User::class,
+            'model' => App\Models\User::class,
 
             'emails' => ['admin@mydomain.com'],
         ],