mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-23 03:16:35 +00:00
Code Issues Projects Releases Wiki Activity

Crash main server thread when RakLib dies

Browse Source 
this way we get crashdumps and find out what's actually wrong with RakLib in the wild.
This commit is contained in:
Dylan K. Taylor 2019-01-09 19:04:12 +00:00
parent cc230034f9
commit 5d8fa2e126
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.lock generated
View File

@ -413,12 +413,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pmmp/RakLib.git", "url": "https://github.com/pmmp/RakLib.git",
"reference": "8f189b687d39489e422bb30be984a33763f29662" "reference": "2f5dfdaa28ff69d72cd1682faa521e18b17a15ef"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pmmp/RakLib/zipball/8f189b687d39489e422bb30be984a33763f29662", "url": "https://api.github.com/repos/pmmp/RakLib/zipball/2f5dfdaa28ff69d72cd1682faa521e18b17a15ef",
"reference": "8f189b687d39489e422bb30be984a33763f29662", "reference": "2f5dfdaa28ff69d72cd1682faa521e18b17a15ef",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -446,7 +446,7 @@
"source": "https://github.com/pmmp/RakLib/tree/master", "source": "https://github.com/pmmp/RakLib/tree/master",
"issues": "https://github.com/pmmp/RakLib/issues" "issues": "https://github.com/pmmp/RakLib/issues"
}, },
"time": "2019-01-04T15:05:24+00:00" "time": "2019-01-09T18:42:21+00:00"
}, },
{ {
"name": "pocketmine/snooze", "name": "pocketmine/snooze",

6
src/pocketmine/network/mcpe/RakLibInterface.php
View File

@ -103,7 +103,11 @@ class RakLibInterface implements ServerInstance, AdvancedNetworkInterface{
public function tick() : void{ public function tick() : void{
if(!$this->rakLib->isRunning() and !$this->rakLib->isShutdown()){ if(!$this->rakLib->isRunning() and !$this->rakLib->isShutdown()){
throw new \Exception("RakLib Thread crashed"); $e = $this->rakLib->getCrashInfo();
if($e !== null){
throw $e;
}
throw new \Exception("RakLib Thread crashed without crash information");
} }
} }