mirror of
https://github.com/lkddi/nexusphp.git
synced 2026-04-24 12:07:23 +08:00
Merge branch 'promotion' into php8
This commit is contained in:
@@ -6,7 +6,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
require "bittorrent.php";
|
require "bittorrent.php";
|
||||||
require "cleanup.php";
|
|
||||||
|
|
||||||
$fd = fopen(sprintf('%s/nexus_cleanup_cli.lock', sys_get_temp_dir()), 'w+');
|
$fd = fopen(sprintf('%s/nexus_cleanup_cli.lock', sys_get_temp_dir()), 'w+');
|
||||||
if (!flock($fd, LOCK_EX|LOCK_NB)) {
|
if (!flock($fd, LOCK_EX|LOCK_NB)) {
|
||||||
@@ -17,8 +16,8 @@ register_shutdown_function(function () use ($fd) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
docleanup(0, true);
|
$result = autoclean();
|
||||||
do_log("[CLEANUP_CLI DONE!]");
|
do_log("[CLEANUP_CLI DONE!] $result");
|
||||||
} catch (\Exception $exception) {
|
} catch (\Exception $exception) {
|
||||||
do_log("ERROR: " . $exception->getMessage());
|
do_log("ERROR: " . $exception->getMessage());
|
||||||
throw new \RuntimeException($exception->getMessage());
|
throw new \RuntimeException($exception->getMessage());
|
||||||
|
|||||||
+15
-1
@@ -11,4 +11,18 @@ $showversion = " - Powered by ".PROJECTNAME;
|
|||||||
defined('ROOT_PATH') || define('ROOT_PATH', dirname(__DIR__) . '/');
|
defined('ROOT_PATH') || define('ROOT_PATH', dirname(__DIR__) . '/');
|
||||||
defined('CURRENT_SCRIPT') || define('CURRENT_SCRIPT', strstr(basename($_SERVER['SCRIPT_FILENAME']), '.', true));
|
defined('CURRENT_SCRIPT') || define('CURRENT_SCRIPT', strstr(basename($_SERVER['SCRIPT_FILENAME']), '.', true));
|
||||||
defined('IS_ANNOUNCE') || define('IS_ANNOUNCE', CURRENT_SCRIPT == 'announce');
|
defined('IS_ANNOUNCE') || define('IS_ANNOUNCE', CURRENT_SCRIPT == 'announce');
|
||||||
defined('REQUEST_ID') || define('REQUEST_ID', $_SERVER['HTTP_X_REQUEST_ID'] ?? $_SERVER['REQUEST_ID'] ?? bin2hex(random_bytes(16)));
|
|
||||||
|
//define the REQUEST_ID
|
||||||
|
if (!defined('REQUEST_ID')) {
|
||||||
|
if (!empty($_SERVER['HTTP_X_REQUEST_ID'])) {
|
||||||
|
$requestId = $_SERVER['HTTP_X_REQUEST_ID'];
|
||||||
|
} elseif (!empty($_SERVER['REQUEST_ID'])) {
|
||||||
|
$requestId = $_SERVER['REQUEST_ID'];
|
||||||
|
} else {
|
||||||
|
$prefix = ($_SERVER['SCRIPT_FILENAME'] ?? '') . implode('', $_SERVER['argv'] ?? []);
|
||||||
|
$prefix = substr(md5($prefix), 0, 5);
|
||||||
|
$requestId = bin2hex(random_bytes(11)) . substr(uniqid($prefix, true), 12);
|
||||||
|
$requestId = substr(str_replace('.', '', $requestId), 0, 32);
|
||||||
|
}
|
||||||
|
define('REQUEST_ID', $requestId);
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user