Merge pull request #445 from annando/new-worker

Support for the new worker class

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 9bd08cf252a4ea5df4223e115a18ccfb7ceb9f0b..ff9a3ac383c6baa0c9f8e86bd52b8216cf49f7d1 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -5,6 +5,9 @@
  * Version: 0.2
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
+
+use Friendica\Core\Worker;
+
 require('addon/pumpio/oauth/http.php');
 require('addon/pumpio/oauth/oauth_client.php');
 require_once('include/enotify.php');
@@ -691,8 +694,7 @@ function pumpio_sync(&$a) {
 }
 
 function pumpio_cron(&$a,$b) {
-       //pumpio_sync($a);
-       proc_run("php","addon/pumpio/pumpio_sync.php");
+       Worker::add(PRIORITY_MEDIUM,"addon/pumpio/pumpio_sync.php");
 }
 
 function pumpio_fetchtimeline(&$a, $uid) {

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 31d3f4dbd43be2f329081fb62a92ac22fa97a966..21b6122ecfc4bc64bffea1e259b3524d28ade800 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -60,6 +60,8 @@
  *     Requirements: PHP5, curl [Slinky library]
  */
 
+use Friendica\Core\Worker;
+
 require_once('include/enotify.php');
 require_once("include/socgraph.php");
 
@@ -646,7 +648,7 @@ function twitter_cron($a,$b) {
        if(count($r)) {
                foreach($r as $rr) {
                        logger('twitter: fetching for user '.$rr['uid']);
-                       proc_run(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int)$rr['uid']);
+                       Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int)$rr['uid']);
                }
        }
 
@@ -668,7 +670,7 @@ function twitter_cron($a,$b) {
                        }
 
                        logger('twitter: importing timeline from user '.$rr['uid']);
-                       proc_run(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, (int)$rr['uid']);
+                       Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, (int)$rr['uid']);
 /*
                        // To-Do
                        // check for new contacts once a day