Merge pull request #2 from DevDavido/development

Bump to v1.0.1

Author: DevDavido

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
 
+## 1.0.1
+- Fixed: Made sure tasks aren't executed concurrently
+- Fixed: composer.json is compatible with Composer v2 now
+
 ## 1.0
 - Initial release

Tasks.php

@@ -67,8 +67,8 @@ public function schedule()
      */
     public function auditSite(int $idSite)
     {
-        if ($this->hasTaskStartedToday($idSite)) {
-            Log::info('Performance Audit task for site ' . $idSite . ' has been already started today');
+        if ($this->hasAnyTaskStartedToday()) {
+            Log::info('Performance Audit tasks have been already started today');
             return;
         }
         Log::info('Performance Audit task for site ' . $idSite . ' will be started now');
@@ -89,6 +89,21 @@ public function auditSite(int $idSite)
         Log::info('Performance Audit task for site ' . $idSite . ' has finished');
     }
 
+    /**
+     * Check if any task has started today.
+     *
+     * @return bool
+     * @throws Exception
+     */
+    private function hasAnyTaskStartedToday()
+    {
+        $tasksStartedToday = array_map(function($site) {
+            return $this->hasTaskStartedToday((int) $site['idsite']);
+        }, Site::getSites());
+
+        return in_array(true, $tasksStartedToday);
+    }
+
     /**
      * Check if this task has started today.
      *

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "DevDavido/performance-audit-plugin",
+    "name": "devdavido/performance-audit-plugin",
     "type": "project",
     "license": "GPL-3.0-only",
     "authors": [