diff --git a/composer.lock b/composer.lock index f2fb5efac..57bea4172 100644 --- a/composer.lock +++ b/composer.lock @@ -554,12 +554,12 @@ "source": { "type": "git", "url": "https://github.com/pmmp/SPL.git", - "reference": "4a94ec60efd514ef98e84a064fe1a4b8ee73bbad" + "reference": "091acb66c7927f2abe8960081d222142b1e6d17b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/SPL/zipball/4a94ec60efd514ef98e84a064fe1a4b8ee73bbad", - "reference": "4a94ec60efd514ef98e84a064fe1a4b8ee73bbad", + "url": "https://api.github.com/repos/pmmp/SPL/zipball/091acb66c7927f2abe8960081d222142b1e6d17b", + "reference": "091acb66c7927f2abe8960081d222142b1e6d17b", "shasum": "" }, "type": "library", @@ -576,7 +576,7 @@ "source": "https://github.com/pmmp/SPL/tree/master", "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": [], diff --git a/src/command/CommandReader.php b/src/command/CommandReader.php index 70660c821..2143ad3c0 100644 --- a/src/command/CommandReader.php +++ b/src/command/CommandReader.php @@ -25,6 +25,7 @@ namespace pocketmine\command; use pocketmine\snooze\SleeperNotifier; use pocketmine\thread\Thread; +use pocketmine\thread\ThreadException; use pocketmine\utils\Utils; use function extension_loaded; 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"; } - throw new \ThreadException($message); + throw new ThreadException($message); } private function initStdin() : void{ diff --git a/src/thread/ThreadException.php b/src/thread/ThreadException.php new file mode 100644 index 000000000..2779c1795 --- /dev/null +++ b/src/thread/ThreadException.php @@ -0,0 +1,28 @@ +quit(); $logger->debug($thread->getThreadName() . " thread stopped successfully."); - }catch(\ThreadException $e){ + }catch(ThreadException $e){ ++$erroredThreads; $logger->debug("Could not stop " . $thread->getThreadName() . " thread: " . $e->getMessage()); }