daemon master: create some compatibility code

8 files changed, 34 insertions, 449 deletions

diff --git a/Zotlabs/Daemon/Deliver.php b/Zotlabs/Daemon/Deliver.php
index 56f0fed78..7a321a1f8 100644
--- a/Zotlabs/Daemon/Deliver.php
+++ b/Zotlabs/Daemon/Deliver.php
@@ -8,7 +8,7 @@ require_once('include/queue_fn.php');
 
 class Deliver {
 	
-	static public function function run($argc,$argv) {
+	static public function run($argc,$argv) {
 
 		if($argc < 2)
 			return;
diff --git a/Zotlabs/Daemon/Directory.php b/Zotlabs/Daemon/Directory.php
index 1312f0638..c8cdafdf5 100644
--- a/Zotlabs/Daemon/Directory.php
+++ b/Zotlabs/Daemon/Directory.php
@@ -51,7 +51,7 @@ class Directory {
 
 			// Now update all the connections
 			if($pushall) 
-				proc_run('php','include/notifier.php','refresh_all',$channel['channel_id']);
+				Master::Summon(array('Notifier','refresh_all',$channel['channel_id']));
 
 			return;
 		}
@@ -94,7 +94,7 @@ class Directory {
 
 		// Now update all the connections
 		if($pushall)
-			proc_run('php','include/notifier.php','refresh_all',$channel['channel_id']);
+			Master::Summon(array('Notifier','refresh_all',$channel['channel_id']));
 
 	}
 }
diff --git a/Zotlabs/Daemon/Master.php b/Zotlabs/Daemon/Master.php
index 3d21a68e0..a78e7c590 100644
--- a/Zotlabs/Daemon/Master.php
+++ b/Zotlabs/Daemon/Master.php
@@ -23,6 +23,7 @@ class Master {
 
 	static public function Release($argc,$argv) {
 		cli_startup();
+		logger('Master: release: ' . print_r($argv,true));
 		require_once('Zotlabs/Daemon/' . $argv[0] . '.php');
 		$cls = '\\Zotlabs\\Daemon\\' . $argv[0];
 		$cls::run($argc,$argv);
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 919f98823..d37182a4d 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -381,7 +381,7 @@ class Notifier {
 					// don't uplink a relayed post to the relay owner
 					if($parent_item['source_xchan'] !== $parent_item['owner_xchan']) {
 						logger('notifier: uplinking this item');
-						proc_run('php','include/notifier.php','uplink',$item_id);
+						Master::Summon(array('Notifier','uplink',$item_id));
 					}
 				}
 
@@ -641,7 +641,8 @@ class Notifier {
 		if($normal_mode) {
 			$x = q("select * from hook where hook = 'notifier_normal'");
 			if($x)
-				proc_run('php','include/deliver_hooks.php', $target_item['id']);
+				Master::Summon(array('Deliver_hooks',$target_item['id']));
+
 		}
 
 		if($deliveries)
diff --git a/Zotlabs/Daemon/Poller.php b/Zotlabs/Daemon/Poller.php
index ab96de7c8..1473b5ec6 100644
--- a/Zotlabs/Daemon/Poller.php
+++ b/Zotlabs/Daemon/Poller.php
@@ -36,7 +36,7 @@ class Poller {
 	
 		// run queue delivery process in the background
 
-		proc_run('php',"include/queue.php");
+		Master::Summon(array('Queue'));
 
 
 		// maintenance for mod sharedwithme - check for updated items and remove them
@@ -76,7 +76,7 @@ class Poller {
 		);
 		if($r) {
 			foreach($r as $rr) {
-				proc_run('php','include/directory.php',$rr['channel_id'],'force');
+				Master::Summon(array('Directory',$rr['channel_id'],'force'));
 				if($interval)
 					@time_sleep_until(microtime(true) + (float) $interval);
 			}
@@ -96,7 +96,7 @@ class Poller {
 					intval($rr['id'])
 				);
 				if($x) {
-					proc_run('php','include/notifier.php','wall-new',$rr['id']);
+					Master::Summon(array('Notifier','wall-new',$rr['id']));
 				}
 			}
 		}
@@ -172,10 +172,10 @@ class Poller {
 				}
 
 				// Check for dead sites
-				proc_run('php', 'include/checksites.php');
+				Master::Summon(array('Checksites'));
 			
 				// update searchable doc indexes
-				proc_run('php', 'include/importdoc.php');
+				Master::Summon(array('Importdoc'));
 
 				/**
 				 * End Cron Weekly
@@ -223,8 +223,8 @@ class Poller {
 
 			set_config('system','last_expire_day',$d2);
 
-			proc_run('php','include/expire.php');
-			proc_run('php','include/cli_suggest.php');
+			Master::Summon(array('Expire'));
+			Master::Summon(array('Cli_suggest'));
 
 			require_once('include/hubloc.php');
 			remove_obsolete_hublocs();
@@ -261,7 +261,7 @@ class Poller {
 		// pull in some public posts
 
 		if(! get_config('system','disable_discover_tab'))
-			proc_run('php','include/externals.php');
+			Master::Summon(array('Externals'));
 
 
 		$manual_id  = 0;
@@ -295,7 +295,7 @@ class Poller {
 		// TODO check to see if there are any cronhooks before wasting a process
 
 		if(! $restart)
-			proc_run('php','include/cronhooks.php');
+			Master::Summon(array('Cronhooks'));
 
 		// Only poll from those with suitable relationships
 
@@ -333,7 +333,7 @@ class Poller {
 						$min = 60;
 					$x = datetime_convert('UTC','UTC',"now - $min minutes");
 					if($c < $x) {
-						proc_run('php','include/onepoll.php',$contact['abook_id']);
+						Master::Summon(array('Onepoll',$contact['abook_id']));
 						if($interval)
 							@time_sleep_until(microtime(true) + (float) $interval);
 					}
@@ -398,7 +398,7 @@ class Poller {
 				if((! $update) && (! $force))
 						continue;
 
-				proc_run('php','include/onepoll.php',$contact['abook_id']);
+				Master::Summon(array('Onepoll',$contact['abook_id']));
 				if($interval)
 					@time_sleep_until(microtime(true) + (float) $interval);
 
@@ -420,7 +420,7 @@ class Poller {
 					if($rr['ud_last'] != NULL_DATE)
 						if($rr['ud_last'] > datetime_convert('UTC','UTC', 'now - 1 day'))
 							continue;
-					proc_run('php','include/onedirsync.php',$rr['ud_id']);
+					Master::Summon(array('Onedirsync',$rr['ud_id']));
 					if($interval)
 						@time_sleep_until(microtime(true) + (float) $interval);
 				}
diff --git a/Zotlabs/Daemon/Ratenotif.php b/Zotlabs/Daemon/Ratenotif.php
index fd2200dc9..a404273e2 100644
--- a/Zotlabs/Daemon/Ratenotif.php
+++ b/Zotlabs/Daemon/Ratenotif.php
@@ -92,7 +92,7 @@ class Ratenotif {
 					$deliver[] = $hash;
 	
 					if(count($deliver) >= $deliveries_per_process) {
-						proc_run('php','include/deliver.php',$deliver);
+						Master::Summon(array('Deliver',$deliver));
 						$deliver = array();
 						if($interval)
 							@time_sleep_until(microtime(true) + (float) $interval);
@@ -102,7 +102,7 @@ class Ratenotif {
 				// catch any stragglers
 	
 				if(count($deliver)) {
-					proc_run('php','include/deliver.php',$deliver);
+					Master::Summon(array('Deliver',$deliver));
 				}
 			}
 		}
diff --git a/boot.php b/boot.php
index 7fc096fa3..bdce2a03f 100755
--- a/boot.php
+++ b/boot.php
@@ -1847,6 +1847,18 @@ function proc_run($cmd){
 	if(count($args) && $args[0] === 'php')
 		$args[0] = ((x(App::$config,'system')) && (x(App::$config['system'],'php_path')) && (strlen(App::$config['system']['php_path'])) ? App::$config['system']['php_path'] : 'php');
 
+	if(strstr($args[1],'include/')) {
+		$orig = substr(ucfirst(substr($args[1],8)),0,-4);
+		logger('proc_run_redirect: ' . $orig);
+		if(file_exists('Zotlabs/Daemon/' . $orig . '.php')) {
+			array_shift($args);
+			$args[0] = $orig;
+			logger('Redirecting old proc_run interface: ' . print_r($args,true));
+			\Zotlabs\Daemon\Master::Summon($args);
+			return;
+		}
+	}
+
 	for($x = 0; $x < count($args); $x++)
 		$args[$x] = escapeshellarg($args[$x]);
 
diff --git a/include/poller.php b/include/poller.php
index 1a5b8508c..0946d0ece 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,442 +1,13 @@
 <?php /** @file */
 
-require_once('boot.php');
 require_once('include/cli_startup.php');
 
-
 function poller_run($argc,$argv){
 
 	cli_startup();
 
-	$a = get_app();
-
-	$maxsysload = intval(get_config('system','maxloadavg'));
-	if($maxsysload < 1)
-		$maxsysload = 50;
-	if(function_exists('sys_getloadavg')) {
-		$load = sys_getloadavg();
-		if(intval($load[0]) > $maxsysload) {
-			logger('system: load ' . $load . ' too high. Poller deferred to next scheduled run.');
-			return;
-		}
-	}
-
-	$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)) 
-		&& (! get_config('system','override_poll_lockfile'))) {
-		logger("poller: Already running");
-		return;
-	}
-	
-	// Create a lockfile.  Needs two vars, but $x doesn't need to contain anything.
-	file_put_contents($lockfile, $x);
-
-	logger('poller: start');
-	
-	// run queue delivery process in the background
-
-	proc_run('php',"include/queue.php");
-
-
-	// maintenance for mod sharedwithme - check for updated items and remove them
-
-	require_once('include/sharedwithme.php');
-	apply_updates();
-	
-
-	// expire any expired mail
-
-	q("delete from mail where expires != '%s' and expires < %s ",
-		dbesc(NULL_DATE),
-		db_utcnow()
-	);
-
-	// expire any expired items
-
-	$r = q("select id from item where expires != '%s' and expires < %s 
-		and item_deleted = 0 ",
-		dbesc(NULL_DATE),
-		db_utcnow()
-	);
-	if($r) {
-		require_once('include/items.php');
-		foreach($r as $rr)
-			drop_item($rr['id'],false);
-	}
-
-
-	// Ensure that every channel pings a directory server once a month. This way we can discover
-	// channels and sites that quietly vanished and prevent the directory from accumulating stale
-	// or dead entries.
-
-	$r = q("select channel_id from channel where channel_dirdate < %s - INTERVAL %s",
-		db_utcnow(), 
-		db_quoteinterval('30 DAY')
-	);
-	if($r) {
-		foreach($r as $rr) {
-			proc_run('php','include/directory.php',$rr['channel_id'],'force');
-			if($interval)
-				@time_sleep_until(microtime(true) + (float) $interval);
-		}
-	}
-
-	// publish any applicable items that were set to be published in the future
-	// (time travel posts). Restrict to items that have come of age in the last
-	// couple of days to limit the query to something reasonable. 
-
-	$r = q("select id from item where item_delayed = 1 and created <= %s  and created > '%s' ",
-		db_utcnow(),
-		dbesc(datetime_convert('UTC','UTC','now - 2 days'))
-	);
-	if($r) {
-		foreach($r as $rr) {
-			$x = q("update item set item_delayed = 0 where id = %d",
-				intval($rr['id'])
-			);
-			if($x) {
-				proc_run('php','include/notifier.php','wall-new',$rr['id']);
-			}
-		}
-	}
-
-	$abandon_days = intval(get_config('system','account_abandon_days'));
-	if($abandon_days < 1)
-		$abandon_days = 0;
-
-	
-	// once daily run birthday_updates and then expire in background
-
-	// FIXME: add birthday updates, both locally and for xprof for use
-	// by directory servers
-
-	$d1 = intval(get_config('system','last_expire_day'));
-	$d2 = intval(datetime_convert('UTC','UTC','now','d'));
-
-	// Allow somebody to staggger daily activities if they have more than one site on their server,
-	// or if it happens at an inconvenient (busy) hour.
-
-	$h1 = intval(get_config('system','cron_hour'));
-	$h2 = intval(datetime_convert('UTC','UTC','now','G'));
-
-	$dirmode = get_config('system','directory_mode');
-
-	/**
-	 * Cron Daily
-	 *
-	 * Actions in the following block are executed once per day, not on every poller run
-	 *
-	 */
-
-	if(($d2 != $d1) && ($h1 == $h2)) {
-
-		require_once('include/dir_fns.php');
-		check_upstream_directory();
-
-		call_hooks('cron_daily',datetime_convert());
-
-
-		$d3 = intval(datetime_convert('UTC','UTC','now','N'));
-		if($d3 == 7) {
-		
-			/**
-			 * Cron Weekly
-			 * 
-			 * Actions in the following block are executed once per day only on Sunday (once per week).
-			 *
-			 */
-
-
-			call_hooks('cron_weekly',datetime_convert());
-
-
-			z_check_cert();
-
-			require_once('include/hubloc.php');
-			prune_hub_reinstalls();
-
-			require_once('include/Contact.php');
-			mark_orphan_hubsxchans();
-
-
-			// get rid of really old poco records
-
-			q("delete from xlink where xlink_updated < %s - INTERVAL %s and xlink_static = 0 ",
-				db_utcnow(), db_quoteinterval('14 DAY')
-			);
-
-			$dirmode = intval(get_config('system','directory_mode'));
-			if($dirmode === DIRECTORY_MODE_SECONDARY || $dirmode === DIRECTORY_MODE_PRIMARY) {
-				logger('regdir: ' . print_r(z_fetch_url(get_directory_primary() . '/regdir?f=&url=' . urlencode(z_root()) . '&realm=' . urlencode(get_directory_realm())),true));
-			}
-
-			// Check for dead sites
-			proc_run('php', 'include/checksites.php');
-			
-			// update searchable doc indexes
-			proc_run('php', 'include/importdoc.php');
-
-			/**
-			 * End Cron Weekly
-			 */
-		}
-
-		update_birthdays();
-
-		//update statistics in config
-		require_once('include/statistics_fns.php');
-		update_channels_total_stat();
-		update_channels_active_halfyear_stat();
-		update_channels_active_monthly_stat();
-		update_local_posts_stat();
-
-		// expire any read notifications over a month old
-
-		q("delete from notify where seen = 1 and date < %s - INTERVAL %s",
-			db_utcnow(), db_quoteinterval('30 DAY')
-		);
-
-		// expire old delivery reports
-
-		$keep_reports = intval(get_config('system','expire_delivery_reports'));
-		if($keep_reports === 0)
-			$keep_reports = 10;
-
-		q("delete from dreport where dreport_time < %s - INTERVAL %s",
-			db_utcnow(),
-			db_quoteinterval($keep_reports . ' DAY')
-		);
-
-		// expire any expired accounts
-		downgrade_accounts();
-
-		// If this is a directory server, request a sync with an upstream
-		// directory at least once a day, up to once every poll interval. 
-		// Pull remote changes and push local changes.
-		// potential issue: how do we keep from creating an endless update loop? 
-
-		if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) {
-			require_once('include/dir_fns.php');
-			sync_directories($dirmode);
-		}
-
-		set_config('system','last_expire_day',$d2);
-
-		proc_run('php','include/expire.php');
-		proc_run('php','include/cli_suggest.php');
-
-		require_once('include/hubloc.php');
-		remove_obsolete_hublocs();
-
-		/**
-		 * End Cron Daily
-		 */
-	}
-
-	// update any photos which didn't get imported properly
-	// This should be rare
-
-	$r = q("select xchan_photo_l, xchan_hash from xchan where xchan_photo_l != '' and xchan_photo_m = '' 
-		and xchan_photo_date < %s - INTERVAL %s",
-		db_utcnow(), 
-		db_quoteinterval('1 DAY')
-	);
-	if($r) {
-		require_once('include/photo/photo_driver.php');
-		foreach($r as $rr) {
-			$photos = import_xchan_photo($rr['xchan_photo_l'],$rr['xchan_hash']);
-			$x = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
-				where xchan_hash = '%s'",
-				dbesc($photos[0]),
-				dbesc($photos[1]),
-				dbesc($photos[2]),
-				dbesc($photos[3]),
-				dbesc($rr['xchan_hash'])
-			);
-		}
-	}
-
-
-	// pull in some public posts
-
-	if(! get_config('system','disable_discover_tab'))
-		proc_run('php','include/externals.php');
-
-
-	$manual_id  = 0;
-	$generation = 0;
-
-	$force      = false;
-	$restart    = false;
-
-	if(($argc > 1) && ($argv[1] == 'force'))
-		$force = true;
-
-	if(($argc > 1) && ($argv[1] == 'restart')) {
-		$restart = true;
-		$generation = intval($argv[2]);
-		if(! $generation)
-			killme();		
-	}
-
-	if(($argc > 1) && intval($argv[1])) {
-		$manual_id = intval($argv[1]);
-		$force     = true;
-	}
-
-
-	$sql_extra = (($manual_id) ? " AND abook_id = " . intval($manual_id) . " " : "");
-
-	reload_plugins();
-
-	$d = datetime_convert();
-
-	// TODO check to see if there are any cronhooks before wasting a process
-
-	if(! $restart)
-		proc_run('php','include/cronhooks.php');
-
-	// Only poll from those with suitable relationships
-
-	$abandon_sql = (($abandon_days) 
-		? sprintf(" AND account_lastlog > %s - INTERVAL %s ", db_utcnow(), db_quoteinterval(intval($abandon_days).' DAY')) 
-		: '' 
-	);
-
-	$randfunc = db_getfunc('RAND');
-	
-	$contacts = q("SELECT * FROM abook LEFT JOIN xchan on abook_xchan = xchan_hash 
-		LEFT JOIN account on abook_account = account_id
-		where abook_self = 0
-		$sql_extra 
-		AND (( account_flags = %d ) OR ( account_flags = %d )) $abandon_sql ORDER BY $randfunc",
-		intval(ACCOUNT_OK),
-		intval(ACCOUNT_UNVERIFIED)     // FIXME
-
-	);
-
-	if($contacts) {
-
-		foreach($contacts as $contact) {
-
-			$update  = false;
-
-			$t = $contact['abook_updated'];
-			$c = $contact['abook_connected'];
-
-			if(intval($contact['abook_feed'])) {
-				$min = service_class_fetch($contact['abook_channel'],'minimum_feedcheck_minutes');
-				if(! $min)
-					$min = intval(get_config('system','minimum_feedcheck_minutes'));
-				if(! $min)
-					$min = 60;
-				$x = datetime_convert('UTC','UTC',"now - $min minutes");
-				if($c < $x) {
-					proc_run('php','include/onepoll.php',$contact['abook_id']);
-					if($interval)
-						@time_sleep_until(microtime(true) + (float) $interval);
-				}
-				continue;
-			}
-
-
-			if($contact['xchan_network'] !== 'zot')
-				continue;
-
-			if($c == $t) {
-				if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
-					$update = true;
-			}
-			else {
-
-				// if we've never connected with them, start the mark for death countdown from now
-
-				if($c == NULL_DATE) {
-					$r = q("update abook set abook_connected = '%s'  where abook_id = %d",
-						dbesc(datetime_convert()),
-						intval($contact['abook_id'])
-					);
-					$c = datetime_convert();
-					$update = true;
-				}
-
-				// He's dead, Jim
-
-				if(strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $c . " + 30 day")) > 0) {	
-					$r = q("update abook set abook_archived = 1 where abook_id = %d",
-						intval($contact['abook_id'])
-					);
-					$update = false;
-					continue;
-				}
-
-				if(intval($contact['abook_archived'])) {
-					$update = false;
-					continue;
-				}
-
-				// might be dead, so maybe don't poll quite so often
-	
-				// recently deceased, so keep up the regular schedule for 3 days
- 
-				if((strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $c . " + 3 day")) > 0)
-				 && (strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $t . " + 1 day")) > 0))
-					$update = true;
-
-				// After that back off and put them on a morphine drip
-
-				if(strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $t . " + 2 day")) > 0) {	
-					$update = true;
-				}
-
-			}
-
-			if(intval($contact['abook_pending']) || intval($contact['abook_archived']) || intval($contact['abook_ignored']) || intval($contact['abook_blocked']))
-				continue;
-
-			if((! $update) && (! $force))
-					continue;
-
-			proc_run('php','include/onepoll.php',$contact['abook_id']);
-			if($interval)
-				@time_sleep_until(microtime(true) + (float) $interval);
-
-		}
-	}
-
-	if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) {
-		$r = q("SELECT u.ud_addr, u.ud_id, u.ud_last FROM updates AS u INNER JOIN (SELECT ud_addr, max(ud_id) AS ud_id FROM updates WHERE ( ud_flags & %d ) = 0 AND ud_addr != '' AND ( ud_last = '%s' OR ud_last > %s - INTERVAL %s ) GROUP BY ud_addr) AS s ON s.ud_id = u.ud_id ",
-			intval(UPDATE_FLAGS_UPDATED),
-			dbesc(NULL_DATE),
-			db_utcnow(), db_quoteinterval('7 DAY')
-		);
-		if($r) {
-			foreach($r as $rr) {
-
-				// If they didn't respond when we attempted before, back off to once a day
-				// After 7 days we won't bother anymore
-
-				if($rr['ud_last'] != NULL_DATE)
-					if($rr['ud_last'] > datetime_convert('UTC','UTC', 'now - 1 day'))
-						continue;
-				proc_run('php','include/onedirsync.php',$rr['ud_id']);
-				if($interval)
-					@time_sleep_until(microtime(true) + (float) $interval);
-			}
-		}
-	}
-
-	set_config('system','lastpoll',datetime_convert());
-
-	//All done - clear the lockfile	
-	@unlink($lockfile);
+	\Zotlabs\Daemon\Master::Summon('Poller');
 
-	return;
 }
 
 if (array_search(__file__,get_included_files())===0){