Changeset 3433173

Timestamp:

01/06/2026 02:43:13 AM (7 weeks ago)

Author:

homio13

Message:

Update to version 3.0.17

Location:

calliope/trunk

Files:

• calliope.php (modified) (1 diff)
• readme-es.txt (modified) (2 diffs)
• readme-ja.txt (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• src/Scheduler/Scheduler.php (modified) (3 diffs)

calliope/trunk/calliope.php

@@ -4 +4 @@
 Plugin URI: https://wordpress.org/plugins/calliope/
 Description: WordPress AI Contents Generator - Automatically generate high-quality content using AI technology
-Version: 3.0.16
+Version: 3.0.17
 Author: homio13
 Author URI: https://profiles.wordpress.org/homio13/

calliope/trunk/readme-es.txt

@@ -5 +5 @@
 Tested up to: 6.9
 Requires PHP: 7.4
-Stable tag: 3.0.16
+Stable tag: 3.0.17
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -128 +128 @@
 == Changelog ==
 
+= 3.0.17 =
+* 🔧 **Corrección de Errores**: Mejorado el programador para usar nombres de hooks únicos por feed para prevenir conflictos de eventos cron al procesar múltiples feeds simultáneamente
+
 = 3.0.16 =
 * 🔧 **Corrección de Errores**: Solucionado el problema donde los artículos no se generaban correctamente al ejecutar el programador de generación automática con múltiples feeds

calliope/trunk/readme-ja.txt

@@ -5 +5 @@
 Tested up to: 6.9
 Requires PHP: 7.4
-Stable tag: 3.0.16
+Stable tag: 3.0.17
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -128 +128 @@
 == Changelog ==
 
+= 3.0.17 =
+* 🔧 **バグ修正**: 複数フィードの同時処理時のcronイベント競合を防ぐため、フィードごとにユニークなフック名を使用するようスケジューラを改善
+
 = 3.0.16 =
 * 🔧 **バグ修正**: 複数のフィードで自動生成スケジューラを実行した際に記事が正しく生成されない問題を修正

calliope/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.9
 Requires PHP: 7.4
-Stable tag: 3.0.16
+Stable tag: 3.0.17
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -128 +128 @@
 == Changelog ==
 
+= 3.0.17 =
+* 🔧 **Bug Fix**: Improved scheduler to use unique hook names per feed to prevent cron event conflicts when processing multiple feeds simultaneously
+
 = 3.0.16 =
 * 🔧 **Bug Fix**: Fixed issue where articles were not generated correctly when running automatic generation scheduler with multiple feeds

calliope/trunk/src/Scheduler/Scheduler.php

@@ -27 +27 @@
     function __construct($_is_test_exec = false)
     {
-        $this->add_single_action('cron_generate_related_keyword');
-        $this->add_single_action('cron_generate_article');
-        $this->add_single_action('cron_generate_post');
+        // スケジュール済みのcronイベントに対応する動的アクションを登録
+        $this->register_dynamic_actions();
+
         $this->is_test_exec = $_is_test_exec;
     }
@@ -358 +358 @@
     function add_single_event($action_name, $time, $args)
     {
-        $args = json_encode($args);
-        // 引数のハッシュ値を使って微小な時間差を作る（複数フィードが同時処理される際の重複を回避）
-        $unique_offset = abs(crc32($args)) % 60;
-        $schedule_time = time() + $time + $unique_offset;
-
-        wp_schedule_single_event($schedule_time, $this->get_cron_slug($action_name), [$args]);
+        $uid = $args['uid'];
+        $args_json = json_encode($args);
+        $schedule_time = time() + $time;
+
+        // フック名にuidを付与してユニークにする（複数フィードの同時処理での競合を回避）
+        $unique_hook = $this->get_cron_slug($action_name) . '_' . $uid;
+
+        // 現在のリクエストでイベントが実行される場合に備えて、アクションを登録
+        add_action($unique_hook, [$this, $action_name]);
+
+        wp_schedule_single_event($schedule_time, $unique_hook, [$args_json]);
     }
 
@@ -403 +408 @@
     }
 
-    ///// actionを登録する
-    function add_single_action($action_name)
-    {
-        add_action($this->get_cron_slug($action_name), [$this, $action_name]);
+    ///// スケジュール済みのcronイベントに対応するアクションを動的に登録する
+    function register_dynamic_actions()
+    {
+        $crons = _get_cron_array();
+        if (empty($crons)) {
+            return;
+        }
+
+        // 対象となるベースアクション名
+        $base_actions = [
+            'cron_generate_related_keyword',
+            'cron_generate_article',
+            'cron_generate_post'
+        ];
+
+        foreach ($crons as $timestamp => $hooks) {
+            foreach ($hooks as $hook => $events) {
+                // calliope_cron_scheduler_XXX_YYY 形式のフックを探す
+                foreach ($base_actions as $base_action) {
+                    $base_hook = $this->get_cron_slug($base_action);
+                    // フック名がベースフック名で始まり、かつベースフック名より長い場合（uid付き）
+                    if (strpos($hook, $base_hook . '_') === 0) {
+                        add_action($hook, [$this, $base_action]);
+                    }
+                }
+            }
+        }
     }
 }