mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-06-07 04:17:07 +00:00
move ThreadException to pocketmine\thread namespace
This commit is contained in:
parent
2e446e4df3
commit
cbef2bbc51
8
composer.lock
generated
8
composer.lock
generated
@ -554,12 +554,12 @@
|
|||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/pmmp/SPL.git",
|
"url": "https://github.com/pmmp/SPL.git",
|
||||||
"reference": "4a94ec60efd514ef98e84a064fe1a4b8ee73bbad"
|
"reference": "091acb66c7927f2abe8960081d222142b1e6d17b"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/pmmp/SPL/zipball/4a94ec60efd514ef98e84a064fe1a4b8ee73bbad",
|
"url": "https://api.github.com/repos/pmmp/SPL/zipball/091acb66c7927f2abe8960081d222142b1e6d17b",
|
||||||
"reference": "4a94ec60efd514ef98e84a064fe1a4b8ee73bbad",
|
"reference": "091acb66c7927f2abe8960081d222142b1e6d17b",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
@ -576,7 +576,7 @@
|
|||||||
"source": "https://github.com/pmmp/SPL/tree/master",
|
"source": "https://github.com/pmmp/SPL/tree/master",
|
||||||
"issues": "https://github.com/pmmp/SPL/issues"
|
"issues": "https://github.com/pmmp/SPL/issues"
|
||||||
},
|
},
|
||||||
"time": "2019-10-28T12:26:23+00:00"
|
"time": "2019-10-29T11:57:45+00:00"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"packages-dev": [],
|
"packages-dev": [],
|
||||||
|
@ -25,6 +25,7 @@ namespace pocketmine\command;
|
|||||||
|
|
||||||
use pocketmine\snooze\SleeperNotifier;
|
use pocketmine\snooze\SleeperNotifier;
|
||||||
use pocketmine\thread\Thread;
|
use pocketmine\thread\Thread;
|
||||||
|
use pocketmine\thread\ThreadException;
|
||||||
use pocketmine\utils\Utils;
|
use pocketmine\utils\Utils;
|
||||||
use function extension_loaded;
|
use function extension_loaded;
|
||||||
use function fclose;
|
use function fclose;
|
||||||
@ -91,7 +92,7 @@ class CommandReader extends Thread{
|
|||||||
$message = "STDIN is being piped from another location and the pipe is blocked, cannot stop safely";
|
$message = "STDIN is being piped from another location and the pipe is blocked, cannot stop safely";
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new \ThreadException($message);
|
throw new ThreadException($message);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function initStdin() : void{
|
private function initStdin() : void{
|
||||||
|
28
src/thread/ThreadException.php
Normal file
28
src/thread/ThreadException.php
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* ____ _ _ __ __ _ __ __ ____
|
||||||
|
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
|
||||||
|
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
|
||||||
|
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
|
||||||
|
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* @author PocketMine Team
|
||||||
|
* @link http://www.pocketmine.net/
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace pocketmine\thread;
|
||||||
|
|
||||||
|
class ThreadException extends \RuntimeException{
|
||||||
|
|
||||||
|
}
|
@ -81,7 +81,7 @@ class ThreadManager extends \Volatile{
|
|||||||
try{
|
try{
|
||||||
$thread->quit();
|
$thread->quit();
|
||||||
$logger->debug($thread->getThreadName() . " thread stopped successfully.");
|
$logger->debug($thread->getThreadName() . " thread stopped successfully.");
|
||||||
}catch(\ThreadException $e){
|
}catch(ThreadException $e){
|
||||||
++$erroredThreads;
|
++$erroredThreads;
|
||||||
$logger->debug("Could not stop " . $thread->getThreadName() . " thread: " . $e->getMessage());
|
$logger->debug("Could not stop " . $thread->getThreadName() . " thread: " . $e->getMessage());
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user