X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fpoller.php;h=e33167c5b14667eba38e01b18a38e5da755ccbe5;hb=ae21c40f21ab4bb5a482d63ae35beff18efa13be;hp=933624ecb57ef0621e3cfc4e6adac52c8b71cc8e;hpb=12c034f4cbdeaf5dd131e32da7fc3b5a253bc943;p=friendica.git

diff --git a/include/poller.php b/include/poller.php
index 933624ecb5..e33167c5b1 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -12,7 +12,6 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
 
 require_once("boot.php");
 
-
 function poller_run(&$argv, &$argc){
 	global $a, $db;
 
@@ -21,24 +20,11 @@ function poller_run(&$argv, &$argc){
 	}
 
 	if(is_null($db)) {
-	    @include(".htconfig.php");
-    	require_once("include/dba.php");
-	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
-    	unset($db_host, $db_user, $db_pass, $db_data);
-  	};
-
-
-	require_once('include/session.php');
-	require_once('include/datetime.php');
-	require_once('library/simplepie/simplepie.inc');
-	require_once('include/items.php');
-	require_once('include/Contact.php');
-	require_once('include/email.php');
-	require_once('include/socgraph.php');
-	require_once('include/pidfile.php');
-
-	load_config('config');
-	load_config('system');
+		@include(".htconfig.php");
+		require_once("include/dba.php");
+		$db = new dba($db_host, $db_user, $db_pass, $db_data);
+		unset($db_host, $db_user, $db_pass, $db_data);
+	};
 
 	$maxsysload = intval(get_config('system','maxloadavg'));
 	if($maxsysload < 1)
@@ -46,259 +32,121 @@ function poller_run(&$argv, &$argc){
 	if(function_exists('sys_getloadavg')) {
 		$load = sys_getloadavg();
 		if(intval($load[0]) > $maxsysload) {
-			logger('system: load ' . $load[0] . ' too high. Poller deferred to next scheduled run.');
+			logger('system: load ' . $load[0] . ' too high. poller deferred to next scheduled run.');
 			return;
 		}
 	}
 
-	$lockpath = get_lockpath();
-	if ($lockpath != '') {
-		$pidfile = new pidfile($lockpath, 'poller');
-		if($pidfile->is_already_running()) {
-			logger("poller: Already running");
-			if ($pidfile->running_time() > 9*60) {
-                                $pidfile->kill();
-                                logger("poller: killed stale process");
-                                // Calling a new instance
-                                proc_run('php','include/poller.php');
-                        }
-			exit;
-		}
-	}
-
-
+	if(($argc <= 1) OR ($argv[1] != "no_cron")) {
+		// Run the cron job that calls all other jobs
+		proc_run("php","include/cron.php");
 
-	$a->set_baseurl(get_config('system','url'));
+		// Run the cronhooks job separately from cron for being able to use a different timing
+		proc_run("php","include/cronhooks.php");
 
-	load_hooks();
+		// Cleaning dead processes
+		$r = q("SELECT DISTINCT(`pid`) FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+		foreach($r AS $pid)
+			if (!posix_kill($pid["pid"], 0))
+				q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
+					intval($pid["pid"]));
 
-	logger('poller: start');
+	} else
+		// Sleep two seconds before checking for running processes to avoid having too many workers
+		sleep(4);
 
-	// run queue delivery process in the background
-
-	proc_run('php',"include/queue.php");
-
-	// run diaspora photo queue process in the background
-
-	proc_run('php',"include/dsprphotoq.php");
-
-	// expire any expired accounts
+	// Checking number of workers
+	if (poller_too_much_workers())
+		return;
 
-	q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
-		AND `account_expires_on` != '0000-00-00 00:00:00'
-		AND `account_expires_on` < UTC_TIMESTAMP() ");
+	$starttime = time();
 
-	// delete user and contact records for recently removed accounts
+	while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
 
-	$r = q("SELECT * FROM `user` WHERE `account_removed` = 1 AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
-	if ($r) {
-		foreach($r as $user) {
-			q("DELETE FROM `contact` WHERE `uid` = %d", intval($user['uid']));
-			q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid']));
+		if(function_exists('sys_getloadavg')) {
+			$load = sys_getloadavg();
+			if(intval($load[0]) > $maxsysload) {
+				logger('system: load ' . $load[0] . ' too high. poller deferred to next scheduled run.');
+				return;
+			}
 		}
-	}
 
-	$abandon_days = intval(get_config('system','account_abandon_days'));
-	if($abandon_days < 1)
-		$abandon_days = 0;
-
-	// Check OStatus conversations
-	check_conversations();
-
-	// To-Do: Regenerate usage statistics
-	// q("ANALYZE TABLE `item`");
-
-	// once daily run birthday_updates and then expire in background
-
-	$d1 = get_config('system','last_expire_day');
-	$d2 = intval(datetime_convert('UTC','UTC','now','d'));
-
-	if($d2 != intval($d1)) {
-
-		update_contact_birthdays();
-
-		update_suggestions();
-
-		set_config('system','last_expire_day',$d2);
-		proc_run('php','include/expire.php');
-	}
-
-	$last = get_config('system','cache_last_cleared');
-
- 	if($last) {
-		$next = $last + (3600); // Once per hour
-		$clear_cache = ($next <= time());
-        } else
-		$clear_cache = true;
-
-	if ($clear_cache) {
-		// clear old cache
-		Cache::clear();
+		// Quit the poller once every hour
+		if (time() > ($starttime + 3600))
+			return;
 
-		// clear old item cache files
-		clear_cache();
+		if (poller_too_much_workers())
+			return;
 
-		// clear cache for photos
-		clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
+		q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d",
+			dbesc(datetime_convert()),
+			intval(getmypid()),
+			intval($r[0]["id"]));
 
-		// clear smarty cache
-		clear_cache($a->get_basepath()."/view/smarty3/compiled", $a->get_basepath()."/view/smarty3/compiled");
+		$argv = json_decode($r[0]["parameter"]);
 
-		// clear cache for image proxy
-		if (!get_config("system", "proxy_disabled")) {
-			clear_cache($a->get_basepath(), $a->get_basepath()."/proxy");
+		$argc = count($argv);
 
-			$cachetime = get_config('system','proxy_cache_time');
-			if (!$cachetime) $cachetime = PROXY_DEFAULT_TIME;
+		// Check for existance and validity of the include file
+		$include = $argv[0];
 
-			q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime);
+		if (!validate_include($include)) {
+			logger("Include file ".$argv[0]." is not valid!");
+			q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
+			continue;
 		}
 
-		set_config('system','cache_last_cleared', time());
-	}
+		require_once($include);
 
-	$manual_id  = 0;
-	$generation = 0;
-	$force      = false;
-	$restart    = false;
+		$funcname=str_replace(".php", "", basename($argv[0]))."_run";
 
-	if(($argc > 1) && ($argv[1] == 'force'))
-		$force = true;
+		if (function_exists($funcname)) {
+			logger("Process ".getmypid().": ".$funcname." ".$r[0]["parameter"]);
+			$funcname($argv, $argc);
 
-	if(($argc > 1) && ($argv[1] == 'restart')) {
-		$restart = true;
-		$generation = intval($argv[2]);
-		if(! $generation)
-			killme();
-	}
+			logger("Process ".getmypid().": ".$funcname." - done");
 
-	if(($argc > 1) && intval($argv[1])) {
-		$manual_id = intval($argv[1]);
-		$force     = true;
+			q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"]));
+		} else
+			logger("Function ".$funcname." does not exist");
 	}
 
-	$interval = intval(get_config('system','poll_interval'));
-	if(! $interval)
-		$interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
-
-	$sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
-
-	reload_plugins();
-
-	$d = datetime_convert();
-
-	if(! $restart)
-		proc_run('php','include/cronhooks.php');
-
-	// Only poll from those with suitable relationships,
-	// and which have a polling address and ignore Diaspora since
-	// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
+}
 
-	$abandon_sql = (($abandon_days)
-		? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days))
-		: ''
-	);
+function poller_too_much_workers() {
 
-	$contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-		WHERE `rel` IN (%d, %d) AND `poll` != '' AND `network` IN ('%s', '%s', '%s', '%s', '%s', '%s')
-		$sql_extra
-		AND NOT `self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly` AND NOT `contact`.`archive`
-		AND NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()",
-		intval(CONTACT_IS_SHARING),
-		intval(CONTACT_IS_FRIEND),
-		dbesc(NETWORK_DFRN),
-		dbesc(NETWORK_ZOT),
-		dbesc(NETWORK_OSTATUS),
-		dbesc(NETWORK_FEED),
-		dbesc(NETWORK_MAIL),
-		dbesc(NETWORK_MAIL2)
-	);
+	if(function_exists('sys_getloadavg')) {
+		$load = sys_getloadavg();
 
-	if(! count($contacts)) {
-		return;
+		// To-Do
+		if ($load < 1)
+			$queues = 10;
+		elseif ($load < 5)
+			$queues = 4;
+		elseif ($load < 10)
+			$queues = 2;
+		else
+			$queues = 1;
+
+	} else {
+		$queues = intval(get_config("system", "worker_queues"));
+
+		if ($queues == 0)
+			$queues = 4;
 	}
 
-	foreach($contacts as $c) {
-
-		$res = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
-			intval($c['id'])
-		);
-
-		if((! $res) || (! count($res)))
-			continue;
-
-		foreach($res as $contact) {
-
-			$xml = false;
-
-			if($manual_id)
-				$contact['last-update'] = '0000-00-00 00:00:00';
-
-			if(in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS)))
-				$contact['priority'] = 2;
-
-			if($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
-				// We should be getting everything via a hub. But just to be sure, let's check once a day.
-				// (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately)
-				// This also lets us update our subscription to the hub, and add or replace hubs in case it
-				// changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'.
-
-				$poll_interval = get_config('system','pushpoll_frequency');
-				$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
-			}
-
-			if($contact['priority'] AND !$force) {
-
-				$update     = false;
-
-				$t = $contact['last-update'];
-
-				/**
-				 * Based on $contact['priority'], should we poll this site now? Or later?
-				 */
-
-				switch ($contact['priority']) {
-					case 5:
-						if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month"))
-							$update = true;
-						break;
-					case 4:
-						if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week"))
-							$update = true;
-						break;
-					case 3:
-						if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
-							$update = true;
-						break;
-					case 2:
-						if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour"))
-							$update = true;
-						break;
-					case 1:
-					default:
-						if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour"))
-							$update = true;
-						break;
-				}
-				if(!$update)
-					continue;
-			}
-
-			logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]);
-
-			proc_run('php','include/onepoll.php',$contact['id']);
-
-			if($interval)
-				@time_sleep_until(microtime(true) + (float) $interval);
-		}
-	}
+	if (poller_active_workers() >= $queues)
+		return;
+}
 
-	logger('poller: end');
+function poller_active_workers() {
+	$workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
 
-	return;
+	return($workers[0]["workers"]);
 }
 
 if (array_search(__file__,get_included_files())===0){
   poller_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }
+?>