GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[MODULE] Reload modules if modified, except in production environment

Browse Source
This commit is contained in:
Hugo Sales 2020-08-05 16:22:12 +00:00 committed by Hugo Sales
parent 58b6026607
commit 4ba71426b6
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
2 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Core/ModuleManager.php
View File

@ -1,7 +1,6 @@
<?php <?php
// {{{ License // {{{ License
// This file is part of GNU social - https://www.gnu.org/software/social // This file is part of GNU social - https://www.gnu.org/software/social
// //
// GNU social is free software: you can redistribute it and/or modify // GNU social is free software: you can redistribute it and/or modify
@ -16,7 +15,6 @@
// //
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with GNU social. If not, see <http://www.gnu.org/licenses/>. // along with GNU social. If not, see <http://www.gnu.org/licenses/>.
// }}} // }}}
/** /**
@ -36,10 +34,22 @@
namespace App\Core; namespace App\Core;
use App\Util\Formatting; use App\Util\Formatting;
use AppendIterator;
use FilesystemIterator;
use Functional as F; use Functional as F;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
class ModuleManager class ModuleManager
{ {
public function __construct()
{
if (!defined('CACHE_FILE')) {
define('CACHE_FILE', INSTALLDIR . '/var/cache/module_manager.php');
}
}
protected static $loader; protected static $loader;
public static function setLoader($l) public static function setLoader($l)
{ {
@ -72,6 +82,23 @@ class ModuleManager
} }
} }
public static function process()
{
$module_paths = array_merge(glob(INSTALLDIR . '/components/*/*.php'), glob(INSTALLDIR . '/plugins/*/*.php'));
$module_manager = new self();
foreach ($module_paths as $path) {
// 'modules' and 'plugins' have the same length
$type = ucfirst(preg_replace('%' . INSTALLDIR . '/(component|plugin)s/.*%', '\1', $path));
$module = basename(dirname($path));
$fqcn = "\\{$type}\\{$module}\\{$module}";
$module_manager->add($fqcn, $path);
}
$module_manager->preRegisterEvents();
file_put_contents(CACHE_FILE, "<?php\nreturn " . var_export($module_manager, true) . ';');
}
public static function __set_state($state) public static function __set_state($state)
{ {
$obj = new self(); $obj = new self();
@ -82,8 +109,21 @@ class ModuleManager
public function loadModules() public function loadModules()
{ {
$f = INSTALLDIR . '/var/cache/module_manager.php'; if ($_ENV['APP_ENV'] == 'prod' && !file_exists(CACHE_FILE)) {
$obj = require $f; throw new Exception('The application needs to be compiled before using in production');
} else {
$rdi = new AppendIterator();
$rdi->append(new RecursiveIteratorIterator(new RecursiveDirectoryIterator(INSTALLDIR . '/components', FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS)));
$rdi->append(new RecursiveIteratorIterator(new RecursiveDirectoryIterator(INSTALLDIR . '/plugins', FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS)));
$time = file_exists(CACHE_FILE) ? filemtime(CACHE_FILE) : 0;
if (F\some($rdi, function ($e) use ($time) { return $e->getMTime() > $time; })) {
self::process();
}
}
$obj = require CACHE_FILE;
foreach ($obj->events as $event => $callables) { foreach ($obj->events as $event => $callables) {
foreach ($callables as $callable) { foreach ($callables as $callable) {
Event::addHandler($event, $callable); Event::addHandler($event, $callable);

14
src/DependencyInjection/Compiler/ModuleManagerPass.php
View File

@ -41,18 +41,6 @@ class ModuleManagerPass implements CompilerPassInterface
{ {
public function process(ContainerBuilder $container) public function process(ContainerBuilder $container)
{ {
$module_paths = array_merge(glob(INSTALLDIR . '/components/*/*.php'), glob(INSTALLDIR . '/plugins/*/*.php')); ModuleManager::process();
$module_manager = new ModuleManager();
foreach ($module_paths as $path) {
// 'modules' and 'plugins' have the same length
$type = ucfirst(preg_replace('%' . INSTALLDIR . '/(component|plugin)s/.*%', '\1', $path));
$module = basename(dirname($path));
$fqcn = "\\{$type}\\{$module}\\{$module}";
$module_manager->add($fqcn, $path);
}
$module_manager->preRegisterEvents();
file_put_contents(INSTALLDIR . '/var/cache/module_manager.php', "<?php\nreturn " . var_export($module_manager, true) . ';');
} }
} }