mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-20 18:34:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'df76c02e7ac3bfbde8ecb597653779e8e1516f58'

Browse Source 
# Conflicts:
#	resources/vanilla
#	tests/phpstan/configs/l7-baseline.neon
This commit is contained in:
Dylan K. Taylor 2020-06-26 19:14:25 +01:00
commit a8180cdf0b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PocketMine.php
View File

@ -281,6 +281,8 @@ namespace pocketmine {
echo Terminal::$FORMAT_RESET . PHP_EOL; echo Terminal::$FORMAT_RESET . PHP_EOL;
Filesystem::releaseLockFile($lockFilePath);
exit($exitCode); exit($exitCode);
} }

2
src/utils/Filesystem.php
View File

@ -46,6 +46,7 @@ use const DIRECTORY_SEPARATOR;
use const LOCK_EX; use const LOCK_EX;
use const LOCK_NB; use const LOCK_NB;
use const LOCK_SH; use const LOCK_SH;
use const LOCK_UN;
use const SCANDIR_SORT_NONE; use const SCANDIR_SORT_NONE;
final class Filesystem{ final class Filesystem{
@ -140,6 +141,7 @@ final class Filesystem{
throw new \InvalidArgumentException("Invalid lock file path"); throw new \InvalidArgumentException("Invalid lock file path");
} }
if(isset(self::$lockFileHandles[$lockFilePath])){ if(isset(self::$lockFileHandles[$lockFilePath])){
flock(self::$lockFileHandles[$lockFilePath], LOCK_UN);
fclose(self::$lockFileHandles[$lockFilePath]); fclose(self::$lockFileHandles[$lockFilePath]);
unset(self::$lockFileHandles[$lockFilePath]); unset(self::$lockFileHandles[$lockFilePath]);
@unlink($lockFilePath); @unlink($lockFilePath);