mirror of
https://github.com/lkddi/nexusphp.git
synced 2026-04-03 14:10:57 +08:00
move is_fpm_mode() to global functions
This commit is contained in:
@@ -40,7 +40,7 @@ class class_cache_redis {
|
||||
if (isset($config['timeout']) && is_numeric($config['timeout'])) {
|
||||
$params[] = $config['timeout'];
|
||||
}
|
||||
if (nexus()->isFpmMode()) {
|
||||
if (is_fpm_mode()) {
|
||||
try {
|
||||
$connectResult = $redis->pconnect(...$params);
|
||||
} catch (\Exception $e) {
|
||||
|
||||
@@ -6,7 +6,7 @@ require_once $rootpath . 'vendor/autoload.php';
|
||||
$USERUPDATESET = array();
|
||||
$query_name=array();
|
||||
\Nexus\Nexus::boot();
|
||||
if (nexus()->isFpmMode()) {
|
||||
if (is_fpm_mode()) {
|
||||
if (!file_exists($rootpath . '.env')
|
||||
|| (getenv('RUNNING_IN_DOCKER') && !file_exists($rootpath . \Nexus\Install\Install::INSTALL_LOCK_FILE))
|
||||
) {
|
||||
|
||||
@@ -1671,3 +1671,8 @@ JS;
|
||||
\Nexus\Nexus::js("js/crypto-js.js", 'footer', true);
|
||||
\Nexus\Nexus::js($js, 'footer', false);
|
||||
}
|
||||
|
||||
function is_fpm_mode(): bool
|
||||
{
|
||||
return php_sapi_name() === 'fpm-fcgi';
|
||||
}
|
||||
|
||||
@@ -176,11 +176,6 @@ final class Nexus
|
||||
return false;
|
||||
}
|
||||
|
||||
public function isFpmMode(): bool
|
||||
{
|
||||
return php_sapi_name() === 'fpm-fcgi';
|
||||
}
|
||||
|
||||
private function generateRequestId(): string
|
||||
{
|
||||
$prefix = ($_SERVER['SCRIPT_FILENAME'] ?? '') . implode('', $_SERVER['argv'] ?? []);
|
||||
|
||||
Reference in New Issue
Block a user