SpoolPost moved

diff --git a/include/spool_post.php b/include/spool_post.php
deleted file mode 100644 (file)
index b7b8de3..0000000
--- a/include/spool_post.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * @file include/spool_post.php
- * @brief Posts items that wer spooled because they couldn't be posted.
- */
-
-use Friendica\Core\Config;
-
-require_once("include/items.php");
-
-function spool_post_run($argv, $argc) {
-       global $a;
-
-       $path = get_spoolpath();
-
-       if (($path != '') && is_writable($path)){
-               if ($dh = opendir($path)) {
-                       while (($file = readdir($dh)) !== false) {
-
-                               // It is not named like a spool file, so we don't care.
-                               if (substr($file, 0, 5) != "item-") {
-                                       continue;
-                               }
-
-                               $fullfile = $path."/".$file;
-
-                               // We don't care about directories either
-                               if (filetype($fullfile) != "file") {
-                                       continue;
-                               }
-
-                               // We can't read or write the file? So we don't care about it.
-                               if (!is_writable($fullfile) || !is_readable($fullfile)) {
-                                       continue;
-                               }
-
-                               $arr = json_decode(file_get_contents($fullfile), true);
-
-                               // If it isn't an array then it is no spool file
-                               if (!is_array($arr)) {
-                                       continue;
-                               }
-
-                               // Skip if it doesn't seem to be an item array
-                               if (!isset($arr['uid']) && !isset($arr['uri']) && !isset($arr['network'])) {
-                                       continue;
-                               }
-
-                               $result = item_store($arr);
-
-                               logger("Spool file ".$file." stored: ".$result, LOGGER_DEBUG);
-                               unlink($fullfile);
-                       }
-                       closedir($dh);
-               }
-       }
-}

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index b06c4920ee63153b3a4c71596763385d412cb77a..276179131bec9ed0857f1b02cb6172c5865e2a7f 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -899,7 +899,7 @@ class Worker {
                logger('Add cron entries', LOGGER_DEBUG);
 
                // Check for spooled items
-               self::add(PRIORITY_HIGH, "spool_post");
+               self::add(PRIORITY_HIGH, "SpoolPost");
 
                // Run the cron job that calls all other jobs
                self::add(PRIORITY_MEDIUM, "Cron");

diff --git a/src/Worker/SpoolPost.php b/src/Worker/SpoolPost.php
new file mode 100644 (file)
index 0000000..a394ee0
--- /dev/null
+++ b/src/Worker/SpoolPost.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @file src/Worker/SpoolPost.php
+ * @brief Posts items that wer spooled because they couldn't be posted.
+ */
+namespace Friendica\Worker;
+
+use Friendica\Core\Config;
+
+require_once("include/items.php");
+
+class SpoolPost {
+       public static function execute() {
+               $path = get_spoolpath();
+
+               if (($path != '') && is_writable($path)){
+                       if ($dh = opendir($path)) {
+                               while (($file = readdir($dh)) !== false) {
+
+                                       // It is not named like a spool file, so we don't care.
+                                       if (substr($file, 0, 5) != "item-") {
+                                               continue;
+                                       }
+
+                                       $fullfile = $path."/".$file;
+
+                                       // We don't care about directories either
+                                       if (filetype($fullfile) != "file") {
+                                               continue;
+                                       }
+
+                                       // We can't read or write the file? So we don't care about it.
+                                       if (!is_writable($fullfile) || !is_readable($fullfile)) {
+                                               continue;
+                                       }
+
+                                       $arr = json_decode(file_get_contents($fullfile), true);
+
+                                       // If it isn't an array then it is no spool file
+                                       if (!is_array($arr)) {
+                                               continue;
+                                       }
+
+                                       // Skip if it doesn't seem to be an item array
+                                       if (!isset($arr['uid']) && !isset($arr['uri']) && !isset($arr['network'])) {
+                                               continue;
+                                       }
+
+                                       $result = item_store($arr);
+
+                                       logger("Spool file ".$file." stored: ".$result, LOGGER_DEBUG);
+                                       unlink($fullfile);
+                               }
+                               closedir($dh);
+                       }
+               }
+       }
+}