move queueworker to core and bump version

3 files changed, 32 insertions, 3 deletions

diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php
index 6629491de..c3158a4eb 100644
--- a/Zotlabs/Daemon/Cron.php
+++ b/Zotlabs/Daemon/Cron.php
@@ -50,7 +50,7 @@ class Cron {
 		require_once('include/account.php');
 		remove_expired_registrations();
 
-		$interval = get_config('system', 'delivery_interval', 3);
+		//$interval = get_config('system', 'delivery_interval', 3);
 
 		// expire any expired items
 
@@ -65,8 +65,10 @@ class Cron {
 				if ($rr['item_wall']) {
 					// The notifier isn't normally invoked unless item_drop is interactive.
 					Master::Summon(['Notifier', 'drop', $rr['id']]);
+					/*
 					if ($interval)
 						@time_sleep_until(microtime(true) + (float)$interval);
+					*/
 				}
 			}
 		}
@@ -96,8 +98,10 @@ class Cron {
 		if ($r) {
 			foreach ($r as $rr) {
 				Master::Summon(array('Directory', $rr['channel_id'], 'force'));
+				/*
 				if ($interval)
 					@time_sleep_until(microtime(true) + (float)$interval);
+				*/
 			}
 		}
 
@@ -151,8 +155,10 @@ class Cron {
 						);
 					}
 					Master::Summon(array('Notifier', 'wall-new', $rr['id']));
+					/*
 					if ($interval)
 						@time_sleep_until(microtime(true) + (float)$interval);
+					*/
 				}
 			}
 		}
diff --git a/Zotlabs/Daemon/Master.php b/Zotlabs/Daemon/Master.php
index 6fa656be5..495718bf4 100644
--- a/Zotlabs/Daemon/Master.php
+++ b/Zotlabs/Daemon/Master.php
@@ -2,6 +2,8 @@
 
 namespace Zotlabs\Daemon;
 
+use Zotlabs\Lib\QueueWorker;
+
 if (array_search(__file__, get_included_files()) === 0) {
 	require_once('include/cli_startup.php');
 	array_shift($argv);
@@ -16,6 +18,10 @@ if (array_search(__file__, get_included_files()) === 0) {
 class Master {
 
 	static public function Summon($arr) {
+
+		QueueWorker::Summon($arr);
+		return;
+/*
 		$hookinfo = [
 			'argv' => $arr
 		];
@@ -32,11 +38,15 @@ class Master {
 
 		$phpbin = get_config('system', 'phpbin', 'php');
 		proc_run($phpbin, 'Zotlabs/Daemon/Master.php', $arr);
+*/
 	}
 
 	static public function Release($argc, $argv) {
 		cli_startup();
 
+		QueueWorker::Release($argv);
+		return;
+/*
 		$hookinfo = [
 			'argv' => $argv
 		];
@@ -54,5 +64,6 @@ class Master {
 		logger('Master: release: ' . json_encode($argv), LOGGER_ALL, LOG_DEBUG);
 		$cls = '\\Zotlabs\\Daemon\\' . $argv[0];
 		$cls::run($argc, $argv);
+*/
 	}
 }
diff --git a/Zotlabs/Daemon/Poller.php b/Zotlabs/Daemon/Poller.php
index 63c498f17..5bf8d3a02 100644
--- a/Zotlabs/Daemon/Poller.php
+++ b/Zotlabs/Daemon/Poller.php
@@ -17,10 +17,12 @@ class Poller {
 			}
 		}
 
+/*
 		$interval = intval(get_config('system', 'poll_interval'));
 		if (!$interval)
 			$interval = ((get_config('system', 'delivery_interval') === false) ? 3 : intval(get_config('system', 'delivery_interval')));
 
+
 		// Check for a lockfile.  If it exists, but is over an hour old, it's stale.  Ignore it.
 		$lockfile = 'store/[data]/poller';
 		if ((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 3600))
@@ -32,6 +34,7 @@ class Poller {
 		// Create a lockfile.  Needs two vars, but $x doesn't need to contain anything.
 		$x = '';
 		file_put_contents($lockfile, $x);
+*/
 
 		logger('poller: start');
 
@@ -103,8 +106,10 @@ class Poller {
 
 					if ($t < $x) {
 						Master::Summon(['Onepoll', $contact['abook_id']]);
+						/*
 						if ($interval)
 							@time_sleep_until(microtime(true) + (float)$interval);
+						*/
 					}
 
 					continue;
@@ -167,8 +172,11 @@ class Poller {
 					continue;
 
 				Master::Summon(['Onepoll', $contact['abook_id']]);
+
+				/*
 				if ($interval)
 					@time_sleep_until(microtime(true) + (float)$interval);
+				*/
 
 			}
 		}
@@ -190,9 +198,13 @@ class Poller {
 					if ($rr['ud_last'] > NULL_DATE)
 						if ($rr['ud_last'] > datetime_convert('UTC', 'UTC', 'now - 1 day'))
 							continue;
+
 					Master::Summon(['Onedirsync', $rr['ud_id']]);
+
+					/*
 					if ($interval)
 						@time_sleep_until(microtime(true) + (float)$interval);
+					*/
 				}
 			}
 		}
@@ -200,9 +212,9 @@ class Poller {
 		set_config('system', 'lastpoll', datetime_convert());
 
 		//All done - clear the lockfile
-
+/*
 		@unlink($lockfile);
-
+*/
 		return;
 	}
 }