diff options
| author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-08-11 10:39:03 +0200 |
|---|---|---|
| committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-08-11 10:39:03 +0200 |
| commit | b89d2d7580e40cd417defaffd2514b5eed38577d (patch) | |
| tree | 78ba9004d87b994dd9a531b475fd51b940bf3dd8 /Zotlabs/Daemon/Master.php | |
| parent | 350e636e3d0a44323c69185555e89cc01a213aa2 (diff) | |
| parent | 047dd31724f8da12c153b4a6f27dc5462f7b97e5 (diff) | |
| download | volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.tar.gz volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.tar.bz2 volse-hubzilla-b89d2d7580e40cd417defaffd2514b5eed38577d.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Daemon/Master.php')
| -rw-r--r-- | Zotlabs/Daemon/Master.php | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/Zotlabs/Daemon/Master.php b/Zotlabs/Daemon/Master.php index 857d47243..67a3acc0a 100644 --- a/Zotlabs/Daemon/Master.php +++ b/Zotlabs/Daemon/Master.php @@ -17,7 +17,22 @@ if(array_search( __file__ , get_included_files()) === 0) { class Master { static public function Summon($arr) { - proc_run('php','Zotlabs/Daemon/Master.php',$arr); + $hookinfo = [ + 'argv'=>$arr + ]; + + call_hooks ('daemon_master_summon',$hookinfo); + + $arr = $hookinfo['argv']; + $argc = count($arr); + + if ((!is_array($arr) || (count($arr) < 1))) { + logger("Summon handled by hook.",LOGGER_DEBUG); + return; + } + + $phpbin = get_config('system','phpbin','php'); + proc_run($phpbin,'Zotlabs/Daemon/Master.php',$arr); } static public function Release($argc,$argv) { @@ -33,6 +48,7 @@ class Master { $argc = count($argv); if ((!is_array($argv) || (count($argv) < 1))) { + logger("Release handled by hook.",LOGGER_DEBUG); return; } |