Merge pull request #682 from ragingdave/disabled-perf-fix

fix performance issue around global vs model log disabling
spatie · Mar 10, 2020 · 4aa4e7d · 4aa4e7d
2 parents 4e44214 + a68fb30
commit 4aa4e7d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Traits/LogsActivity.php b/src/Traits/LogsActivity.php
@@ -9,6 +9,7 @@
 use Illuminate\Support\Collection;
 use Spatie\Activitylog\ActivityLogger;
 use Spatie\Activitylog\ActivitylogServiceProvider;
+use Spatie\Activitylog\ActivityLogStatus;
 
 trait LogsActivity
 {
@@ -128,7 +129,9 @@ public function attributesToBeIgnored(): array
 
     protected function shouldLogEvent(string $eventName): bool
     {
-        if (! $this->enableLoggingModelsEvents) {
+        $logStatus = app(ActivityLogStatus::class);
+
+        if (! $this->enableLoggingModelsEvents || $logStatus->disabled()) {
             return false;
         }